Changeset: 2ce9a90dcdd6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2ce9a90dcdd6
Modified Files:
        gdk/gdk_bbp.c
        gdk/gdk_tm.c
Branch: Sep2022
Log Message:

During commit during initialization, the type may not yet be known.


diffs (24 lines):

diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -3880,7 +3880,7 @@ BBPsync(int cnt, bat *restrict subcommit
                        if (size > bi.count) /* includes sizes==NULL */
                                size = bi.count;
                        bi.b->batInserted = size;
-                       if (ATOMvarsized(bi.b->ttype)) {
+                       if (bi.b->ttype >= 0 && ATOMvarsized(bi.b->ttype)) {
                                /* see epilogue() for other part of this */
                                MT_lock_set(&bi.b->theaplock);
                                /* remember the tail we're saving */
diff --git a/gdk/gdk_tm.c b/gdk/gdk_tm.c
--- a/gdk/gdk_tm.c
+++ b/gdk/gdk_tm.c
@@ -83,7 +83,7 @@ epilogue(int cnt, bat *subcommit, bool l
                        }
                }
                b = BBP_desc(bid);
-               if (b && ATOMvarsized(b->ttype)) {
+               if (b && b->ttype >= 0 && ATOMvarsized(b->ttype)) {
                        MT_lock_set(&b->theaplock);
                        ValPtr p = BATgetprop_nolock(b, (enum prop_t) 20);
                        if (p != NULL) {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to