MonetDB: Jan2022 - Merge with Jul2021 branch.

[Sjoerd Mullender]

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

Merge with Jul2021 branch.


diffs (32 lines):

diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -3945,9 +3945,10 @@ BBPsync(int cnt, bat *restrict subcommit
                        BUN size = sizes ? sizes[idx] : BUN_NONE;
                        BATiter bi;
 
-                       /* add a fix so that BBPmanager doesn't interfere */
-                       BBPfix(i);
                        if (BBP_status(i) & BBPPERSISTENT) {
+                               /* add a fix so that BBPmanager doesn't
+                                * interfere */
+                               BBPfix(i);
                                BAT *b = dirty_bat(&i, subcommit != NULL);
                                if (i <= 0) {
                                        decref(-i, false, false, locked_by == 0 
|| locked_by != MT_getpid(), __func__);
@@ -3987,9 +3988,12 @@ BBPsync(int cnt, bat *restrict subcommit
                                n = BBPdir_step(i, size, n, buf, sizeof(buf), 
&obbpf, nbbpf, subcommit != NULL, &bi);
                        }
                        bat_iterator_end(&bi);
-                       /* can't use BBPunfix because of the "lock"
-                        * argument: locked_by may be set here */
-                       decref(i, false, false, locked_by == 0 || locked_by != 
MT_getpid(), __func__);
+                       if (BBP_status(i) & BBPPERSISTENT) {
+                               /* can't use BBPunfix because of the
+                                * "lock" argument: locked_by may be set
+                                * here */
+                               decref(i, false, false, locked_by == 0 || 
locked_by != MT_getpid(), __func__);
+                       }
                        if (n == -2)
                                break;
                        /* we once again have a saved heap */
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org