rename npy_load_string to npy_string_load

ngoldbaum · ngoldbaum · commit 955e66d0d0a5 · 2023-10-24T15:00:19.000-06:00
diff --git a/stringdtype/stringdtype/src/casts.c b/stringdtype/stringdtype/src/casts.c
@@ -97,7 +97,7 @@ string_to_string(PyArrayMethod_Context *context, char *const data[],
                 }
             }
             else if (free_and_copy(idescr->allocator, odescr->allocator, s, os,
-                              "string to string cast") == -1) {
+                                   "string to string cast") == -1) {
                 return -1;
             }
         }
@@ -240,7 +240,7 @@ unicode_to_string(PyArrayMethod_Context *context, char *const data[],
             return -1;
         }
         npy_static_string out_ss = {0, NULL};
-        int is_null = npy_load_string(allocator, out_pss, &out_ss);
+        int is_null = npy_string_load(allocator, out_pss, &out_ss);
         if (is_null == -1) {
             gil_error(PyExc_MemoryError,
                       "Failed to load string in unicode to string cast");
@@ -373,7 +373,7 @@ string_to_unicode(PyArrayMethod_Context *context, char *const data[],
         npy_static_string name;
         unsigned char *this_string = NULL;
         size_t n_bytes;
-        int is_null = npy_load_string(allocator, ps, &s);
+        int is_null = npy_string_load(allocator, ps, &s);
         if (is_null == -1) {
             gil_error(PyExc_MemoryError,
                       "Failed to load string in unicode to string cast");
@@ -473,7 +473,7 @@ string_to_bool(PyArrayMethod_Context *context, char *const data[],
     while (N--) {
         const npy_packed_static_string *ps = (npy_packed_static_string *)in;
         npy_static_string s = {0, NULL};
-        int is_null = npy_load_string(allocator, ps, &s);
+        int is_null = npy_string_load(allocator, ps, &s);
         if (is_null == -1) {
             gil_error(PyExc_MemoryError,
                       "Failed to load string in unicode to string cast");
@@ -577,7 +577,7 @@ string_to_pylong(char *in, int hasnull,
 {
     const npy_packed_static_string *ps = (npy_packed_static_string *)in;
     npy_static_string s = {0, NULL};
-    int isnull = npy_load_string(allocator, ps, &s);
+    int isnull = npy_string_load(allocator, ps, &s);
     if (isnull == -1) {
         PyErr_SetString(PyExc_MemoryError,
                         "Failed to load string converting string to int");
@@ -860,7 +860,7 @@ string_to_pyfloat(char *in, int hasnull,
 {
     const npy_packed_static_string *ps = (npy_packed_static_string *)in;
     npy_static_string s = {0, NULL};
-    int isnull = npy_load_string(allocator, ps, &s);
+    int isnull = npy_string_load(allocator, ps, &s);
     if (isnull == -1) {
         PyErr_SetString(
                 PyExc_MemoryError,
@@ -1104,7 +1104,7 @@ string_to_datetime(PyArrayMethod_Context *context, char *const data[],
     while (N--) {
         const npy_packed_static_string *ps = (npy_packed_static_string *)in;
         npy_static_string s = {0, NULL};
-        int is_null = npy_load_string(allocator, ps, &s);
+        int is_null = npy_string_load(allocator, ps, &s);
         if (is_null == -1) {
             // do we hold the gil in this cast? error handling below seems to
             // think we do
diff --git a/stringdtype/stringdtype/src/dtype.c b/stringdtype/stringdtype/src/dtype.c
@@ -104,7 +104,7 @@ new_stringdtype_instance(PyObject *na_object, int coerce)
     snew->array_owned = 0;
 
     npy_static_string default_string = {0, NULL};
-    if (npy_load_string(allocator, &snew->packed_default_string,
+    if (npy_string_load(allocator, &snew->packed_default_string,
                         &default_string) == -1) {
         PyErr_SetString(PyExc_MemoryError,
                         "Failed to load packed string while "
@@ -114,7 +114,7 @@ new_stringdtype_instance(PyObject *na_object, int coerce)
     }
 
     npy_static_string na_name = {0, NULL};
-    if (npy_load_string(allocator, &snew->packed_na_name, &na_name) == -1) {
+    if (npy_string_load(allocator, &snew->packed_na_name, &na_name) == -1) {
         PyErr_SetString(PyExc_MemoryError,
                         "Failed to load packed string while "
                         "creating StringDType instance.");
@@ -317,7 +317,7 @@ stringdtype_getitem(StringDTypeObject *descr, char **dataptr)
     npy_packed_static_string *psdata = (npy_packed_static_string *)dataptr;
     npy_static_string sdata = {0, NULL};
     int hasnull = descr->na_object != NULL;
-    int is_null = npy_load_string(descr->allocator, psdata, &sdata);
+    int is_null = npy_string_load(descr->allocator, psdata, &sdata);
 
     if (is_null < 0) {
         PyErr_SetString(PyExc_MemoryError,
@@ -387,10 +387,10 @@ _compare(void *a, void *b, StringDTypeObject *descr_a,
     npy_static_string *default_string = &descr_a->default_string;
     const npy_packed_static_string *ps_a = (npy_packed_static_string *)a;
     npy_static_string s_a = {0, NULL};
-    int a_is_null = npy_load_string(allocator_a, ps_a, &s_a);
+    int a_is_null = npy_string_load(allocator_a, ps_a, &s_a);
     const npy_packed_static_string *ps_b = (npy_packed_static_string *)b;
     npy_static_string s_b = {0, NULL};
-    int b_is_null = npy_load_string(allocator_b, ps_b, &s_b);
+    int b_is_null = npy_string_load(allocator_b, ps_b, &s_b);
     if (NPY_UNLIKELY(a_is_null == -1 || b_is_null == -1)) {
         char *msg = "Failed to load string in string comparison";
         if (hasnull && !(has_string_na && has_nan_na)) {
diff --git a/stringdtype/stringdtype/src/static_string.c b/stringdtype/stringdtype/src/static_string.c
@@ -214,7 +214,7 @@ is_not_a_vstring(const npy_packed_static_string *s)
 }
 
 int
-npy_load_string(npy_string_allocator *allocator,
+npy_string_load(npy_string_allocator *allocator,
                 const npy_packed_static_string *packed_string,
                 npy_static_string *unpacked_string)
 {
diff --git a/stringdtype/stringdtype/src/static_string.h b/stringdtype/stringdtype/src/static_string.h
@@ -17,7 +17,7 @@ typedef struct npy_static_string {
 // npy_static_string API functions.
 extern const npy_packed_static_string *NPY_EMPTY_STRING;
 // Represents a sentinel value, use npy_string_isnull or the return value of
-// npy_load_string to check if a value is null before working with the unpacked
+// npy_string_load to check if a value is null before working with the unpacked
 // representation.
 extern const npy_packed_static_string *NPY_NULL_STRING;
 
@@ -113,7 +113,7 @@ npy_string_cmp(const npy_static_string *s1, const npy_static_string *s2);
 // string, and returns 0 otherwise. This function can be used to
 // simultaneously unpack a string and determine if it is a null string.
 int
-npy_load_string(npy_string_allocator *allocator,
+npy_string_load(npy_string_allocator *allocator,
                 const npy_packed_static_string *packed_string,
                 npy_static_string *unpacked_string);
 
diff --git a/stringdtype/stringdtype/src/umath.c b/stringdtype/stringdtype/src/umath.c
@@ -57,7 +57,7 @@ multiply_resolve_descriptors(
                           "Failed to deallocate string in multiply");        \
                 return -1;                                                   \
             }                                                                \
-            int is_isnull = npy_load_string(idescr->allocator, ips, &is);    \
+            int is_isnull = npy_string_load(idescr->allocator, ips, &is);    \
             if (is_isnull == -1) {                                           \
                 gil_error(PyExc_MemoryError,                                 \
                           "Failed to load string in multiply");              \
@@ -94,7 +94,7 @@ multiply_resolve_descriptors(
             }                                                                \
                                                                              \
             npy_static_string os = {0, NULL};                                \
-            int is_null = npy_load_string(odescr->allocator, ops, &os);      \
+            int is_null = npy_string_load(odescr->allocator, ops, &os);      \
             if (is_null == -1) {                                             \
                 gil_error(PyExc_MemoryError,                                 \
                           "Failed to load string in string multiply");       \
@@ -259,10 +259,10 @@ add_strided_loop(PyArrayMethod_Context *context, char *const data[],
     while (N--) {
         const npy_packed_static_string *ps1 = (npy_packed_static_string *)in1;
         npy_static_string s1 = {0, NULL};
-        int s1_isnull = npy_load_string(s1descr->allocator, ps1, &s1);
+        int s1_isnull = npy_string_load(s1descr->allocator, ps1, &s1);
         const npy_packed_static_string *ps2 = (npy_packed_static_string *)in2;
         npy_static_string s2 = {0, NULL};
-        int s2_isnull = npy_load_string(s2descr->allocator, ps2, &s2);
+        int s2_isnull = npy_string_load(s2descr->allocator, ps2, &s2);
         if (s1_isnull == -1 || s2_isnull == -1) {
             gil_error(PyExc_MemoryError, "Failed to load string in add");
             return -1;
@@ -307,7 +307,7 @@ add_strided_loop(PyArrayMethod_Context *context, char *const data[],
 
         npy_static_string os = {0, NULL};
 
-        if (npy_load_string(odescr->allocator, ops, &os) < 0) {
+        if (npy_string_load(odescr->allocator, ops, &os) < 0) {
             gil_error(PyExc_MemoryError, "Failed to load string in add");
         };
 
@@ -442,10 +442,10 @@ string_equal_strided_loop(PyArrayMethod_Context *context, char *const data[],
     while (N--) {
         const npy_packed_static_string *ps1 = (npy_packed_static_string *)in1;
         npy_static_string s1 = {0, NULL};
-        int s1_isnull = npy_load_string(descr1->allocator, ps1, &s1);
+        int s1_isnull = npy_string_load(descr1->allocator, ps1, &s1);
         const npy_packed_static_string *ps2 = (npy_packed_static_string *)in2;
         npy_static_string s2 = {0, NULL};
-        int s2_isnull = npy_load_string(descr2->allocator, ps2, &s2);
+        int s2_isnull = npy_string_load(descr2->allocator, ps2, &s2);
         if (NPY_UNLIKELY(s1_isnull < 0 || s2_isnull < 0)) {
             gil_error(PyExc_MemoryError, "Failed to load string in equal");
             return -1;
@@ -513,10 +513,10 @@ string_not_equal_strided_loop(PyArrayMethod_Context *context,
     while (N--) {
         const npy_packed_static_string *ps1 = (npy_packed_static_string *)in1;
         npy_static_string s1 = {0, NULL};
-        int s1_isnull = npy_load_string(descr1->allocator, ps1, &s1);
+        int s1_isnull = npy_string_load(descr1->allocator, ps1, &s1);
         const npy_packed_static_string *ps2 = (npy_packed_static_string *)in2;
         npy_static_string s2 = {0, NULL};
-        int s2_isnull = npy_load_string(descr2->allocator, ps2, &s2);
+        int s2_isnull = npy_string_load(descr2->allocator, ps2, &s2);
         if (NPY_UNLIKELY(s1_isnull < 0 || s2_isnull < 0)) {
             gil_error(PyExc_MemoryError, "Failed to load string in not equal");
             return -1;
@@ -584,10 +584,10 @@ string_greater_strided_loop(PyArrayMethod_Context *context, char *const data[],
     while (N--) {
         const npy_packed_static_string *ps1 = (npy_packed_static_string *)in1;
         npy_static_string s1 = {0, NULL};
-        int s1_isnull = npy_load_string(descr1->allocator, ps1, &s1);
+        int s1_isnull = npy_string_load(descr1->allocator, ps1, &s1);
         const npy_packed_static_string *ps2 = (npy_packed_static_string *)in2;
         npy_static_string s2 = {0, NULL};
-        int s2_isnull = npy_load_string(descr2->allocator, ps2, &s2);
+        int s2_isnull = npy_string_load(descr2->allocator, ps2, &s2);
         if (NPY_UNLIKELY(s1_isnull < 0 || s2_isnull < 0)) {
             gil_error(PyExc_MemoryError, "Failed to load string in greater");
             return -1;
@@ -653,10 +653,10 @@ string_greater_equal_strided_loop(PyArrayMethod_Context *context,
     while (N--) {
         const npy_packed_static_string *ps1 = (npy_packed_static_string *)in1;
         npy_static_string s1 = {0, NULL};
-        int s1_isnull = npy_load_string(descr1->allocator, ps1, &s1);
+        int s1_isnull = npy_string_load(descr1->allocator, ps1, &s1);
         const npy_packed_static_string *ps2 = (npy_packed_static_string *)in2;
         npy_static_string s2 = {0, NULL};
-        int s2_isnull = npy_load_string(descr2->allocator, ps2, &s2);
+        int s2_isnull = npy_string_load(descr2->allocator, ps2, &s2);
         if (NPY_UNLIKELY(s1_isnull < 0 || s2_isnull < 0)) {
             gil_error(PyExc_MemoryError,
                       "Failed to load string in greater equal");
@@ -721,10 +721,10 @@ string_less_strided_loop(PyArrayMethod_Context *context, char *const data[],
     while (N--) {
         const npy_packed_static_string *ps1 = (npy_packed_static_string *)in1;
         npy_static_string s1 = {0, NULL};
-        int s1_isnull = npy_load_string(descr1->allocator, ps1, &s1);
+        int s1_isnull = npy_string_load(descr1->allocator, ps1, &s1);
         const npy_packed_static_string *ps2 = (npy_packed_static_string *)in2;
         npy_static_string s2 = {0, NULL};
-        int s2_isnull = npy_load_string(descr2->allocator, ps2, &s2);
+        int s2_isnull = npy_string_load(descr2->allocator, ps2, &s2);
         if (NPY_UNLIKELY(s1_isnull < 0 || s2_isnull < 0)) {
             gil_error(PyExc_MemoryError, "Failed to load string in less");
             return -1;
@@ -789,10 +789,10 @@ string_less_equal_strided_loop(PyArrayMethod_Context *context,
     while (N--) {
         const npy_packed_static_string *ps1 = (npy_packed_static_string *)in1;
         npy_static_string s1 = {0, NULL};
-        int s1_isnull = npy_load_string(descr1->allocator, ps1, &s1);
+        int s1_isnull = npy_string_load(descr1->allocator, ps1, &s1);
         const npy_packed_static_string *ps2 = (npy_packed_static_string *)in2;
         npy_static_string s2 = {0, NULL};
-        int s2_isnull = npy_load_string(descr2->allocator, ps2, &s2);
+        int s2_isnull = npy_string_load(descr2->allocator, ps2, &s2);
         if (NPY_UNLIKELY(s1_isnull < 0 || s2_isnull < 0)) {
             gil_error(PyExc_MemoryError,
                       "Failed to load string in less equal");

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ is_not_a_vstring(const npy_packed_static_string *s)`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`int`
`217`		`-npy_load_string(npy_string_allocator *allocator,`
	`217`	`+npy_string_load(npy_string_allocator *allocator,`
`218`	`218`	`const npy_packed_static_string *packed_string,`
`219`	`219`	`npy_static_string *unpacked_string)`
`220`	`220`	`{`