Changeset: cc640bcc393d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/cc640bcc393d
Modified Files:
        sql/storage/objectset.c
        sql/storage/store.c
Branch: Sep2022
Log Message:

Merge with Jan2022 branch.


diffs (23 lines):

diff --git a/sql/storage/objectset.c b/sql/storage/objectset.c
--- a/sql/storage/objectset.c
+++ b/sql/storage/objectset.c
@@ -599,7 +599,7 @@ tc_gc_objectversion(sql_store store, sql
        assert(!change->handled);
        objectversion *ov = (objectversion*)change->data;
 
-       if (oldest && oldest >= TRANSACTION_ID_BASE)
+       if (oldest >= TRANSACTION_ID_BASE)
                return 0;
        int res = os_cleanup( (sqlstore*) store, ov, oldest);
        change->handled = (res)?true:false;
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -2269,6 +2269,7 @@ store_pending_changes(sqlstore *store, u
                        node *next = n->next;
                        sql_change *c = n->data;
 
+                       assert(c->cleanup);
                        if (c->cleanup(store, c, oldest)) {
                                list_remove_node(store->changes, store, n);
                                _DELETE(c);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to