Changeset: fc34d149353b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fc34d149353b
Modified Files:
monetdb5/extras/pyapi/pyapi.c
monetdb5/extras/pyapi/pytypes.h
Branch: pyapi
Log Message:
Change default conversion behavior when testing is disabled.
diffs (72 lines):
diff --git a/monetdb5/extras/pyapi/pyapi.c b/monetdb5/extras/pyapi/pyapi.c
--- a/monetdb5/extras/pyapi/pyapi.c
+++ b/monetdb5/extras/pyapi/pyapi.c
@@ -2004,7 +2004,6 @@ PyObject *PyArrayObject_FromBAT(PyInput
case TYPE_str:
#ifdef _PYAPI_TESTING_
if (option_numpy_string_array)
-#endif
{
bool unicode = false;
size_t maxsize = 1;
@@ -2092,10 +2091,14 @@ PyObject *PyArrayObject_FromBAT(PyInput
}
}
}
-#ifdef _PYAPI_TESTING_
else
+#endif
{
+#ifdef PYAPI_TESTING
bool unicode = option_alwaysunicode;
+#else
+ bool unicode = false;
+#endif
li = bat_iterator(b);
//create a NPY_OBJECT array object
vararray = PyArray_New(
@@ -2109,7 +2112,9 @@ PyObject *PyArrayObject_FromBAT(PyInput
0,
NULL);
+#ifdef PYAPI_TESTING
if (!option_alwaysunicode)
+#endif
{
BATloop(b, p, q) {
char *t = (char *) BUNtail(li, p);
@@ -2146,6 +2151,7 @@ PyObject *PyArrayObject_FromBAT(PyInput
}
data[j++] = obj;
}
+#ifdef PYAPI_TESTING
} else if (option_bytearray) {
BATloop(b, p, q) {
char *t = (char *) BUNtail(li, p);
@@ -2156,6 +2162,7 @@ PyObject *PyArrayObject_FromBAT(PyInput
}
data[j++] = obj;
}
+#endif
} else {
BATloop(b, p, q) {
char *t = (char *) BUNtail(li, p);
@@ -2169,7 +2176,6 @@ PyObject *PyArrayObject_FromBAT(PyInput
}
}
}
-#endif
break;
#ifdef HAVE_HGE
case TYPE_hge:
diff --git a/monetdb5/extras/pyapi/pytypes.h b/monetdb5/extras/pyapi/pytypes.h
--- a/monetdb5/extras/pyapi/pytypes.h
+++ b/monetdb5/extras/pyapi/pytypes.h
@@ -65,6 +65,7 @@ struct _PyInput{
sql_subtype *sql_subtype; //SQL typename (for _column_types)
size_t count; //amount of elements in BAT
bool scalar; //True if the input is a scalar (in
this case, BAT* is NULL)
+ PyObject *result; //Converted PyObject, probably
shouldn't be here
};
#define PyInput struct _PyInput
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
