MonetDB: Jan2022 - Merge with Jul2021 branch.

[Sjoerd Mullender]

Changeset: 491e5dddfc8c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/491e5dddfc8c
Modified Files:
        gdk/gdk_align.c
        gdk/gdk_batop.c
        gdk/gdk_logger.c
Branch: Jan2022
Log Message:

Merge with Jul2021 branch.


diffs (58 lines):

diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -140,6 +140,7 @@ VIEWcreate(oid seq, BAT *b)
                }
                if (bn->tvheap) {
                        BBPunshare(bn->tvheap->parentid);
+                       BBPunfix(bn->tvheap->parentid);
                        HEAPdecref(bn->tvheap, false);
                }
                HEAPdecref(bn->theap, false);
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -91,8 +91,10 @@ insert_string_bat(BAT *b, BAT *n, struct
                /* we can share the vheaps, so we then only need to
                 * append the offsets */
                MT_lock_set(&b->theaplock);
-               if (b->tvheap->parentid != b->batCacheid)
+               if (b->tvheap->parentid != b->batCacheid) {
                        BBPunshare(b->tvheap->parentid);
+                       BBPunfix(b->tvheap->parentid);
+               }
                HEAPdecref(b->tvheap, b->tvheap->parentid == b->batCacheid);
                HEAPincref(ni.vh);
                b->tvheap = ni.vh;
@@ -374,8 +376,10 @@ append_varsized_bat(BAT *b, BAT *n, stru
                 * is read-only, we replace b's vheap with a reference
                 * to n's */
                MT_lock_set(&b->theaplock);
-               if (b->tvheap->parentid != b->batCacheid)
+               if (b->tvheap->parentid != b->batCacheid) {
                        BBPunshare(b->tvheap->parentid);
+                       BBPunfix(b->tvheap->parentid);
+               }
                BBPshare(ni.vh->parentid);
                HEAPdecref(b->tvheap, true);
                HEAPincref(ni.vh);
@@ -434,6 +438,7 @@ append_varsized_bat(BAT *b, BAT *n, stru
                        return GDK_FAIL;
                }
                BBPunshare(b->tvheap->parentid);
+               BBPunfix(b->tvheap->parentid);
                MT_lock_set(&b->theaplock);
                HEAPdecref(b->tvheap, false);
                ATOMIC_INIT(&h->refs, 1);
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2236,7 +2236,7 @@ logger_next_logfile(logger *lg, ulng ts)
 {
        if (!lg->pending || !lg->pending->next)
                return 0;
-       if (lg->pending->last_ts < ts)
+       if (lg->pending->last_ts <= ts)
                return lg->pending->id;
        return 0;
 }
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org