Changeset: f8784bbfa71a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f8784bbfa71a
Modified Files:
tools/monetdbe/monetdbe.c
Branch: default
Log Message:
small cleanup
diffs (72 lines):
diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -181,14 +181,14 @@ monetdbe_cleanup_result_internal(monetdb
char* msg = MAL_SUCCEED;
monetdbe_result_internal* res = (monetdbe_result_internal *) result;
Client c = (Client) dbhdl;
-
- mvc* m = NULL;
+ mvc *m = NULL;
assert(!res->dbhdl || res->dbhdl == dbhdl);
if ((msg = validate_database_handle(dbhdl,
"monetdbe.monetdbe_cleanup_result_internal")) != MAL_SUCCEED)
return msg;
if ((msg = getSQLContext(c, NULL, &m, NULL)) != MAL_SUCCEED)
goto cleanup;
+
if (!result) {
msg = createException(MAL,
"monetdbe.monetdbe_cleanup_result_internal", "Parameter result is NULL");
goto cleanup;
@@ -316,8 +316,10 @@ monetdbe_query_internal(monetdbe_databas
if (m->results) {
res_internal->res.ncols = (size_t) m->results->nr_cols;
+ res_internal->monetdbe_resultset = m->results;
if (m->results->nr_cols > 0 && m->results->order) {
BAT* bb = BATdescriptor(m->results->order);
+ m->results = NULL;
if (!bb) {
msg = createException(MAL,
"monetdbe.monetdbe_query_internal", RUNTIME_OBJECT_MISSING);
goto cleanup;
@@ -325,13 +327,12 @@ monetdbe_query_internal(monetdbe_databas
res_internal->res.nrows = BATcount(bb);
BBPunfix(bb->batCacheid);
}
- res_internal->monetdbe_resultset = m->results;
+ m->results = NULL;
res_internal->converted_columns =
GDKzalloc(sizeof(monetdbe_column*) * res_internal->res.ncols);
if (!res_internal->converted_columns) {
msg = createException(MAL,
"monetdbe.monetdbe_query_internal", MAL_MALLOC_FAIL);
goto cleanup;
}
- m->results = NULL;
}
}
@@ -791,8 +792,10 @@ monetdbe_execute(monetdbe_statement *stm
if (m->results) {
res_internal->res.ncols = (size_t) m->results->nr_cols;
+ res_internal->monetdbe_resultset = m->results;
if (m->results->nr_cols > 0 && m->results->order) {
BAT* bb = BATdescriptor(m->results->order);
+ m->results = NULL;
if (!bb) {
msg = createException(MAL,
"monetdbe.monetdbe_query_internal", RUNTIME_OBJECT_MISSING);
goto cleanup;
@@ -800,13 +803,12 @@ monetdbe_execute(monetdbe_statement *stm
res_internal->res.nrows = BATcount(bb);
BBPunfix(bb->batCacheid);
}
- res_internal->monetdbe_resultset = m->results;
+ m->results = NULL;
res_internal->converted_columns =
GDKzalloc(sizeof(monetdbe_column*) * res_internal->res.ncols);
if (!res_internal->converted_columns) {
msg = createException(MAL,
"monetdbe.monetdbe_query_internal", MAL_MALLOC_FAIL);
goto cleanup;
}
- m->results = NULL;
}
}
cleanup:
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
