Changeset: 38793bcf91be for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=38793bcf91be
Modified Files:
monetdb5/extras/pyapi/pyapi.c
monetdb5/extras/pyapi/pytypes.h
Branch: pyapi
Log Message:
Use the correct seqbase type.
diffs (33 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
@@ -386,7 +386,7 @@ str PyAPIeval(Client cntxt, MalBlkPtr mb
PyObject *code_object = NULL;
PyReturn *pyreturn_values = NULL;
PyInput *pyinput_values = NULL;
- int seqbase = 0;
+ oid seqbase = 0;
#ifndef WIN32
char *shm_ptr;
QueryStruct *query_ptr = NULL;
@@ -2176,7 +2176,7 @@ wrapup:
return FALSE;
}
-BAT *PyObject_ConvertToBAT(PyReturn *ret, sql_subtype *type, int bat_type, int
i, int seqbase, char **return_message, bool copy)
+BAT *PyObject_ConvertToBAT(PyReturn *ret, sql_subtype *type, int bat_type, int
i, oid seqbase, char **return_message, bool copy)
{
BAT *b = NULL;
size_t index_offset = 0;
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
@@ -107,7 +107,7 @@ pyapi_export PyObject *PyObject_CheckFor
//! Preprocess a PyObject (that is the result of PyObject_CheckForConversion),
pyreturn_values must be an array of PyReturn structs of size column_count
pyapi_export bool PyObject_PreprocessObject(PyObject *pResult, PyReturn
*pyreturn_values, int column_count, char **return_message);
//! Create a BAT from the i'th PyReturn struct (filled by
PyObject_PreprocessObject), with bat_type set to the expected BAT Type (set
this to PyType_ToBat(ret->result_type) if there is no expected type), seqbase
should be set to 0 unless you know what you're doing
-pyapi_export BAT *PyObject_ConvertToBAT(PyReturn *ret, sql_subtype *type, int
bat_type, int index, int seqbase, char **return_message, bool copy);
+pyapi_export BAT *PyObject_ConvertToBAT(PyReturn *ret, sql_subtype *type, int
bat_type, int index, oid seqbase, char **return_message, bool copy);
pyapi_export char *BatType_Format(int);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
