Changeset: a42d32c5d989 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a42d32c5d989
Modified Files:
gdk/gdk_select.c
Branch: Dec2023
Log Message:
Fix another (observed) deadlock.
diffs (23 lines):
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -1222,6 +1222,9 @@ BATrange(BATiter *bi, const void *tl, co
if (tl == NULL && th == NULL)
return range_contains; /* looking for everything */
+ if (VIEWtparent(bi->b))
+ pb = BATdescriptor(VIEWtparent(bi->b));
+
/* keep locked while we look at the property values */
MT_lock_set(&bi->b->theaplock);
if (bi->minpos != BUN_NONE)
@@ -1237,8 +1240,7 @@ BATrange(BATiter *bi, const void *tl, co
}
bool keep = false; /* keep lock on parent bat? */
if (minprop == NULL || maxprop == NULL) {
- if (VIEWtparent(bi->b) &&
- (pb = BATdescriptor(VIEWtparent(bi->b))) != NULL) {
+ if (pb != NULL) {
MT_lock_set(&pb->theaplock);
if (minprop == NULL && (minprop = BATgetprop_nolock(pb,
GDK_MIN_BOUND)) != NULL) {
keep = true;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
