MonetDB: Dec2023 - Fix test which decides to unload bats.

[Sjoerd Mullender via checkin-list]

Changeset: f44f3f1ac20e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f44f3f1ac20e
Modified Files:
        gdk/gdk_bbp.c
Branch: Dec2023
Log Message:

Fix test which decides to unload bats.

The old test prevented any persistent bat from getting unloaded, but
that was not what it was meant to do.


diffs (19 lines):

diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1743,8 +1743,13 @@ BBPtrim(bool aggressive, bat nbat)
                        MT_lock_set(&b->theaplock);
                        if (!BATshared(b) &&
                            !isVIEW(b) &&
-                           (!BATdirty(b) || (aggressive && b->theap->storage 
== STORE_MMAP && (b->tvheap == NULL || b->tvheap->storage == STORE_MMAP))) &&
-                           (b->batRole == PERSISTENT && BBP_lrefs(bid) <= 2)) {
+                           (!BATdirty(b) ||
+                            (aggressive &&
+                             b->theap->storage == STORE_MMAP &&
+                             (b->tvheap == NULL ||
+                              b->tvheap->storage == STORE_MMAP)) ||
+                            (b->batRole == PERSISTENT &&
+                             BBP_lrefs(bid) <= 2))) {
                                BBP_status_on(bid, BBPUNLOADING);
                                swap = true;
                                waitctr += BATdirty(b) ? 9 : 1;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org