MonetDB: Aug2024 - merged with dec2023

[Niels Nes via checkin-list]

Changeset: c0e9aa9e45d2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c0e9aa9e45d2
Modified Files:
        gdk/gdk_bbp.c
        sql/storage/objectset.c
Branch: Aug2024
Log Message:

merged with dec2023


diffs (28 lines):

diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -2176,7 +2176,7 @@ BBPinit(bool allow_hge_upgrade)
                }
        }
 
-       if (MT_create_thread(&manager, BBPmanager, NULL, MT_THR_DETACHED, 
"BBPmanager") < 0) {
+       if (!GDKinmemory(0) && MT_create_thread(&manager, BBPmanager, NULL, 
MT_THR_DETACHED, "BBPmanager") < 0) {
                TRC_CRITICAL(GDK, "Could not start BBPmanager thread.");
                return GDK_FAIL;
        }
diff --git a/sql/storage/objectset.c b/sql/storage/objectset.c
--- a/sql/storage/objectset.c
+++ b/sql/storage/objectset.c
@@ -643,9 +643,9 @@ tc_commit_objectversion(sql_trans *tr, s
                (void)oldest;
                if (!tr->parent)
                        change->obj->new = 0;
-               ATOMIC_INC(&tr->cat->schema_version);
-       }
-       else {
+               if (!ov->os->temporary)
+                       ATOMIC_INC(&tr->cat->schema_version);
+       } else {
                os_rollback(ov, tr->store);
        }
 
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org