MonetDB: Jul2021 - make sure we pass the right pointers for vari...

[Niels Nes]

Changeset: 630e8821cb0e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/630e8821cb0e
Modified Files:
        tools/monetdbe/monetdbe.c
Branch: Jul2021
Log Message:

make sure we pass the right pointers for variable sized object arrays


diffs (30 lines):

diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -2112,7 +2112,7 @@ remote_cleanup:
                                if (!s)
                                        s = (char*) nil;
 
-                               if 
(store->storage_api.append_col(m->session->tr, c, pos+j, s, mtype, 1) != 0) {
+                               if 
(store->storage_api.append_col(m->session->tr, c, pos+j, &s, mtype, 1) != 0) {
                                        mdbe->msg = createException(SQL, 
"monetdbe.monetdbe_append", "Cannot append values");
                                        goto cleanup;
                                }
@@ -2171,7 +2171,7 @@ remote_cleanup:
                                int res;
 
                                if (blob_is_null(be+j)) {
-                                       res = 
store->storage_api.append_col(m->session->tr, c, pos+j, (blob*)nil, mtype, 1);
+                                       res = 
store->storage_api.append_col(m->session->tr, c, pos+j, ((blob*)&nil), mtype, 
1);
                                } else {
                                        size_t len = be[j].size;
                                        var_t nlen = blobsize(len);
@@ -2190,7 +2190,7 @@ remote_cleanup:
 
                                        bbuf->nitems = len;
                                        memcpy(bbuf->data, be[j].data, len);
-                                       res = 
store->storage_api.append_col(m->session->tr, c, pos+j, bbuf, mtype, 1);
+                                       res = 
store->storage_api.append_col(m->session->tr, c, pos+j, &bbuf, mtype, 1);
                                }
                                if (res != 0) {
                                        mdbe->msg = createException(SQL, 
"monetdbe.monetdbe_append", "Cannot append values");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list