MonetDB: default - Merge with Dec2023 branch.

[Sjoerd Mullender via checkin-list]

Changeset: 2f3f28c1a20d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2f3f28c1a20d
Modified Files:
        gdk/gdk_select.c
        monetdb5/modules/atoms/str.c
Branch: default
Log Message:

Merge with Dec2023 branch.


diffs (55 lines):

diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -1223,10 +1223,10 @@ BATrange(BATiter *bi, const void *tl, co
                maxval = VALptr(maxprop);
                maxincl = false;
        }
+       bool keep = false;      /* keep lock on parent bat? */
        if (minprop == NULL || maxprop == NULL) {
                if (VIEWtparent(bi->b) &&
                    (pb = BATdescriptor(VIEWtparent(bi->b))) != NULL) {
-                       bool keep = false;
                        MT_lock_set(&pb->theaplock);
                        if (minprop == NULL && (minprop = BATgetprop_nolock(pb, 
GDK_MIN_BOUND)) != NULL) {
                                keep = true;
@@ -1239,8 +1239,6 @@ BATrange(BATiter *bi, const void *tl, co
                        }
                        if (!keep) {
                                MT_lock_unset(&pb->theaplock);
-                               BBPreclaim(pb);
-                               pb = NULL;
                        }
                }
        }
@@ -1328,12 +1326,13 @@ BATrange(BATiter *bi, const void *tl, co
                }
        }
 
+       MT_lock_unset(&bi->b->theaplock);
        if (pb) {
-               MT_lock_unset(&pb->theaplock);
+               if (keep)
+                       MT_lock_unset(&pb->theaplock);
                BBPreclaim(pb);
        }
 
-       MT_lock_unset(&bi->b->theaplock);
        return range;
 }
 
diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -5336,9 +5336,9 @@ STRselect(bat *r_id, const bat *b_id, co
 
        if (!msg) {
                BATsetcount(r, rcnt);
-               r->tsorted = r->batCount <= 1;
+               r->tsorted = true;
                r->trevsorted = r->batCount <= 1;
-               r->tkey = false;
+               r->tkey = true;
                r->tnil = false;
                r->tnonil = true;
                r->tseqbase = rcnt == 0 ?
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org