MonetDB: Jul2021 - Dereference external values.

[Sjoerd Mullender]

Changeset: a53bf23e6341 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a53bf23e6341
Modified Files:
        monetdb5/modules/kernel/bat5.c
Branch: Jul2021
Log Message:

Dereference external values.


diffs (51 lines):

diff --git a/monetdb5/modules/kernel/bat5.c b/monetdb5/modules/kernel/bat5.c
--- a/monetdb5/modules/kernel/bat5.c
+++ b/monetdb5/modules/kernel/bat5.c
@@ -44,6 +44,17 @@
  */
 
 
+#define derefStr(b, v)                                                 \
+       do {                                                                    
        \
+               int _tpe= ATOMstorage((b)->ttype);              \
+               if (_tpe >= TYPE_str) {                                 \
+                       if ((v) == 0 || *(str*) (v) == 0)       \
+                               (v) = (str) str_nil;                    \
+                       else                                                    
        \
+                               (v) = *(str *) (v);                             
\
+               }                                                               
                \
+       } while (0)
+
 str
 BKCnewBAT(bat *res, const int *tt, const BUN *cap, role_t role)
 {
@@ -232,12 +243,7 @@ BKCappend_val_force_wrap(bat *r, const b
                throw(MAL, "bat.append", SQLSTATE(HY002) 
RUNTIME_OBJECT_MISSING);
        if ((b = BATsetaccess(b, BAT_WRITE)) == NULL)
                throw(MAL, "bat.append", OPERATION_FAILED);
-       if (b->ttype >= TYPE_str && ATOMstorage(b->ttype) >= TYPE_str) {
-               if (u == 0 || *(str*)u == 0)
-                       u = (ptr) str_nil;
-               else
-                       u = (ptr) *(str *)u;
-       }
+       derefStr(b, u);
        if (BUNappend(b, u, force ? *force : false) != GDK_SUCCEED) {
                BBPunfix(b->batCacheid);
                throw(MAL, "bat.append", GDK_EXCEPTION);
@@ -262,6 +268,7 @@ BKCbun_inplace(bat *r, const bat *bid, c
 
        if ((b = BATdescriptor(*bid)) == NULL)
                throw(MAL, "bat.inplace", SQLSTATE(HY002) 
RUNTIME_OBJECT_MISSING);
+       derefStr(b, t);
        if (void_inplace(b, *id, t, false) != GDK_SUCCEED) {
                BBPunfix(b->batCacheid);
                throw(MAL, "bat.inplace", GDK_EXCEPTION);
@@ -280,6 +287,7 @@ BKCbun_inplace_force(bat *r, const bat *
 
        if ((b = BATdescriptor(*bid)) == NULL)
                throw(MAL, "bat.inplace", SQLSTATE(HY002) 
RUNTIME_OBJECT_MISSING);
+       derefStr(b, t);
        if (void_inplace(b, *id, t, *force) != GDK_SUCCEED) {
                BBPunfix(b->batCacheid);
                throw(MAL, "bat.inplace", GDK_EXCEPTION);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list