MonetDB: Sep2022 - Merge with Jan2022 branch.

[Sjoerd Mullender]

Changeset: aa676e9e0b69 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/aa676e9e0b69
Modified Files:
        monetdb5/modules/mal/tablet.c
Branch: Sep2022
Log Message:

Merge with Jan2022 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
@@ -1549,13 +1549,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) {
@@ -1566,7 +1567,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;
                }
@@ -1580,11 +1581,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;
@@ -1617,7 +1613,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;
@@ -1656,8 +1652,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;
@@ -1910,10 +1906,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 -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org