Changeset: fd330ff99ac6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fd330ff99ac6
Modified Files:
monetdb5/modules/mal/tablet.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/vaults/json/json.c
Branch: nested
Log Message:
fix post merge errors
diffs (119 lines):
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -709,7 +709,7 @@ output_complex(Tablet *as, stream *fd, b
if (buf == NULL || localbuf == NULL) {
//GDKfree(buf);
//GDKfree(localbuf);
- ma_close(ta, &ta_state);
+ ma_close(&ta_state);
return -1;
}
for (i = 0; i < as->nr; i++) {
@@ -725,7 +725,7 @@ output_complex(Tablet *as, stream *fd, b
}
//GDKfree(localbuf);
//GDKfree(buf);
- ma_close(ta, &ta_state);
+ ma_close(&ta_state);
if (res < 0)
return (int)res;
return 0;
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -5949,7 +5949,7 @@ insert_json_value(JSONterm *jt, sql_subt
} else {
msg = createException(SQL, "sql.insert_json_value",
"jsonv2local failed");
}
- ma_close(ta, &ta_state);
+ ma_close(&ta_state);
//if (v->vtype == TYPE_str)
// GDKfree(v->val.sval);
} else {
@@ -6332,14 +6332,14 @@ SQLfrom_json(Client cntxt, MalBlkPtr mb,
BBPkeepref(bats[i]);
}
//GDKfree(bats);
- ma_close(ta, &ta_state);
+ ma_close(&ta_state);
return MAL_SUCCEED;
bailout:
for(int i = 0; i < pci->retc; i++)
if (bats[i])
BBPreclaim(bats[i]);
//GDKfree(bats);
- ma_close(ta, &ta_state);
+ ma_close(&ta_state);
if (msg) {
if (sqlstate)
throw(SQL, "SQLfrom_json", SQLSTATE(HY013) "%s", msg);
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -2446,7 +2446,7 @@ mvc_from_string(mvc *m, BAT **bats, int
allocator_state ta_state = ma_open(ta);
Column *fmt = (Column *) ma_zalloc(ta, sizeof(Column) * nr);
if (!fmt) {
- ma_close(ta, &ta_state);
+ ma_close(&ta_state);
throw(SQL, "sql.from_varchar", SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
(void)m;
@@ -2454,7 +2454,7 @@ mvc_from_string(mvc *m, BAT **bats, int
if (from_string_cols(fmt, bats, nr, 0, t) < 0) {
//GDKfree(fmt);
- ma_close(ta, &ta_state);
+ ma_close(&ta_state);
throw(SQL, "sql.from_varchar", SQLSTATE(HY013) "Multiset and/or
composite type expected");
}
@@ -2465,7 +2465,7 @@ mvc_from_string(mvc *m, BAT **bats, int
else
msg = TUPLEparser(ta, &s, fmt, nr, &elm, t);
//GDKfree(fmt);
- ma_close(ta, &ta_state);
+ ma_close(&ta_state);
return msg;
}
diff --git a/sql/backends/monet5/vaults/json/json.c
b/sql/backends/monet5/vaults/json/json.c
--- a/sql/backends/monet5/vaults/json/json.c
+++ b/sql/backends/monet5/vaults/json/json.c
@@ -260,7 +260,7 @@ JSONread_json(Client cntxt, MalBlkPtr mb
BAT *b = NULL;
if (!jfh) {
msg = createException(SQL, "json.read_json", "Failed to open
file %s", fname);
- ma_close(ta, &ta_state);
+ ma_close(&ta_state);
return msg;
}
json_str = read_json_file(ta, jfh);
@@ -283,7 +283,7 @@ JSONread_json(Client cntxt, MalBlkPtr mb
} else {
msg = createException(SQL, "json.read_json", "JSONparse error");
}
- ma_close(ta, &ta_state);
+ ma_close(&ta_state);
return msg;
}
@@ -299,7 +299,7 @@ JSONread_ndjson(Client cntxt, MalBlkPtr
JSONFileHandle *jfh = json_open(fname, ta);
if (!jfh) {
msg = createException(SQL, "json.read_ndjson", "Failed to open
file %s", fname);
- ma_close(ta, &ta_state);
+ ma_close(&ta_state);
return msg;
}
char *content = read_json_file(ta, jfh);
@@ -351,7 +351,7 @@ JSONread_ndjson(Client cntxt, MalBlkPtr
} else {
BBPreclaim(b);
}
- ma_close(ta, &ta_state);
+ ma_close(&ta_state);
return msg;
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
