Changeset: 871f8b54f112 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/871f8b54f112
Modified Files:
sql/backends/monet5/UDF/pyapi3/conversion3.c
sql/server/sql_scan.c
Branch: Mar2025
Log Message:
Simplify.
diffs (56 lines):
diff --git a/sql/backends/monet5/UDF/pyapi3/conversion3.c
b/sql/backends/monet5/UDF/pyapi3/conversion3.c
--- a/sql/backends/monet5/UDF/pyapi3/conversion3.c
+++ b/sql/backends/monet5/UDF/pyapi3/conversion3.c
@@ -136,19 +136,18 @@ PyMaskedArray_FromBAT(PyInput *inp, size
bool bnonil = b->tnonil;
MT_lock_unset(&b->theaplock);
if (!bnonil) {
- PyObject *mod = PyImport_ImportModule("numpy.ma");
- PyObject *mafunc = PyObject_GetAttrString( mod, "masked_array");
PyObject *nullmask = PyNullMask_FromBAT(b, t_start, t_end);
if (!nullmask) {
Py_DECREF(vararray);
- Py_DECREF(mafunc);
- Py_DECREF(mod);
msg = createException(MAL, "pyapi3.eval", "Failed to
create mask for some reason");
goto wrapup;
} else if (nullmask == Py_None) {
Py_DECREF(nullmask);
} else {
+ PyObject *mod = PyImport_ImportModule("numpy.ma");
+ PyObject *mafunc = PyObject_GetAttrString( mod,
"masked_array");
+ Py_DECREF(mod);
PyObject *maargs = PyTuple_New(2);
PyTuple_SetItem(maargs, 0, vararray);
PyTuple_SetItem(maargs, 1, nullmask);
@@ -157,16 +156,13 @@ PyMaskedArray_FromBAT(PyInput *inp, size
// array constructor
PyObject *mask = PyObject_CallObject(mafunc, maargs);
Py_DECREF(maargs);
+ Py_DECREF(mafunc);
if (!mask) {
- Py_DECREF(mafunc);
- Py_DECREF(mod);
msg = createException(MAL, "pyapi3.eval",
SQLSTATE(PY000) "Failed to create mask");
goto wrapup;
}
vararray = mask;
}
- Py_DECREF(mafunc);
- Py_DECREF(mod);
}
return vararray;
wrapup:
diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -86,7 +86,7 @@ uescape_xform(char *restrict s, const ch
return s;
}
-/**
+Simplify./**
* Removes all comments before the query. In query comments are kept.
*/
char *
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
