Changeset: c8f8a6d6093e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c8f8a6d6093e
Modified Files:
monetdb5/modules/mal/tablet.c
Branch: default
Log Message:
Merge with Sep2022 branch.
diffs (74 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
@@ -1563,13 +1563,14 @@ SQLload_file(Client cntxt, Tablet *as, b
create_rejects_table(task.cntxt);
if (task.cntxt->error_row == NULL || task.cntxt->error_fld == NULL ||
task.cntxt->error_msg == NULL || task.cntxt->error_input == NULL) {
tablet_error(&task, lng_nil, lng_nil, int_nil, "SQLload
initialization failed", "");
- goto bailout;
+ /* nothing allocated yet, so nothing to free */
+ return BUN_NONE;
}
assert(rsep);
assert(csep);
assert(maxrow < 0 || maxrow <= (lng) BUN_MAX);
- task.fields = (char ***) GDKmalloc(as->nr_attrs * sizeof(char **));
+ task.fields = (char ***) GDKzalloc(as->nr_attrs * sizeof(char **));
task.cols = (int *) GDKzalloc(as->nr_attrs * sizeof(int));
task.time = (lng *) GDKzalloc(as->nr_attrs * sizeof(lng));
if (task.fields == NULL || task.cols == NULL || task.time == NULL) {
@@ -1580,7 +1581,7 @@ SQLload_file(Client cntxt, Tablet *as, b
for (i = 0; i < MAXBUFFERS; i++) {
task.base[i] = GDKmalloc(MAXROWSIZE(2 * b->size) + 2);
task.rowlimit[i] = MAXROWSIZE(2 * b->size);
- if (task.base[i] == 0) {
+ if (task.base[i] == NULL) {
tablet_error(&task, lng_nil, lng_nil, int_nil,
SQLSTATE(HY013) MAL_MALLOC_FAIL, "SQLload_file");
goto bailout;
}
@@ -1594,11 +1595,6 @@ SQLload_file(Client cntxt, Tablet *as, b
else
task.maxrow = (BUN) maxrow;
- if (task.fields == 0 || task.cols == 0 || task.time == 0) {
- tablet_error(&task, lng_nil, lng_nil, int_nil, SQLSTATE(HY013)
MAL_MALLOC_FAIL, "SQLload_file");
- goto bailout;
- }
-
task.skip = skip;
task.quote = quote;
task.csep = csep;
@@ -1624,7 +1620,7 @@ SQLload_file(Client cntxt, Tablet *as, b
task.limit = (int) (b->size / as->nr_attrs + as->nr_attrs);
for (i = 0; i < as->nr_attrs; i++) {
task.fields[i] = GDKmalloc(sizeof(char *) * task.limit);
- if (task.fields[i] == 0) {
+ if (task.fields[i] == NULL) {
if (task.as->error == NULL)
as->error = createException(MAL,
"sql.copy_from", SQLSTATE(HY013) MAL_MALLOC_FAIL);
goto bailout;
@@ -1660,8 +1656,8 @@ SQLload_file(Client cntxt, Tablet *as, b
ptask[j] = task;
ptask[j].id = j;
ptask[j].cols = (int *) GDKzalloc(as->nr_attrs * sizeof(int));
- if (ptask[j].cols == 0) {
- tablet_error(&task, lng_nil, lng_nil, int_nil,
SQLSTATE(HY013) MAL_MALLOC_FAIL, "SQLload_file");
+ if (ptask[j].cols == NULL) {
+ tablet_error(&task, lng_nil, lng_nil, int_nil,
SQLSTATE(HY013) MAL_MALLOC _FAIL, "SQLload_file");
task.id = -1;
MT_sema_up(&task.producer);
goto bailout;
@@ -1905,10 +1901,8 @@ SQLload_file(Client cntxt, Tablet *as, b
bailout:
if (task.fields) {
- for (i = 0; i < as->nr_attrs; i++) {
- if (task.fields[i])
- GDKfree(task.fields[i]);
- }
+ for (i = 0; i < as->nr_attrs; i++)
+ GDKfree(task.fields[i]);
GDKfree(task.fields);
}
GDKfree(task.time);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
