Changeset: 1b0b1a25397e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1b0b1a25397e
Modified Files:
gdk/gdk_bbp.c
Branch: default
Log Message:
Merge with Jan2022 branch.
diffs (truncated from 34623 to 300 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -2786,6 +2786,7 @@ decref(bat i, bool logical, bool release
{
int refs = 0, lrefs;
bool swap = false;
+ bool locked = false;
bat tp = 0, tvp = 0;
int farmid = 0;
BAT *b;
@@ -2840,6 +2841,8 @@ decref(bat i, bool logical, bool release
assert(b == NULL || b->tvheap == NULL ||
BBP_refs(b->tvheap->parentid) > 0);
refs = --BBP_refs(i);
if (b && refs == 0) {
+ MT_lock_set(&b->theaplock);
+ locked = true;
tp = VIEWtparent(b);
tvp = VIEWvtparent(b);
if (tp || tvp)
@@ -2848,7 +2851,8 @@ decref(bat i, bool logical, bool release
}
}
if (b) {
- MT_lock_set(&b->theaplock);
+ if (!locked)
+ MT_lock_set(&b->theaplock);
#if 0
if (b->batCount > b->batInserted && !isVIEW(b)) {
/* if batCount is larger than batInserted and
@@ -2864,7 +2868,6 @@ decref(bat i, bool logical, bool release
#endif
if (b->theap)
farmid = b->theap->farmid;
- MT_lock_unset(&b->theaplock);
}
/* we destroy transients asap and unload persistent bats only
diff --git a/sql/benchmarks/ATIS/run.all b/sql/benchmarks/ATIS/run.all
deleted file mode 100755
--- a/sql/benchmarks/ATIS/run.all
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V.
-
-SQL="mclient -umonetdb -Pmonetdb -lsql"
-if [ $# -eq 1 ]; then
- SQL=$1
-fi
-
-echo "loading"
-$SQL < load.sql
-echo "simple join"
-$SQL < Tests/select_simple_join.sql
-echo "join"
-$SQL < Tests/select_join.sql
-echo "distinct"
-$SQL < Tests/select_distinct.sql
-echo "prefix_join"
-$SQL < Tests/select_key_prefix_join.sql
-echo "group"
-$SQL < Tests/select_group.sql
-echo "drop"
-$SQL < drop.sql
diff --git a/sql/benchmarks/arno/ATOM.int.tbl b/sql/benchmarks/arno/ATOM.int.tbl
deleted file mode 100644
--- a/sql/benchmarks/arno/ATOM.int.tbl
+++ /dev/null
@@ -1,4893 +0,0 @@
-d1_1,1,c,22,0
-d1_2,1,c,22,0
-d1_3,1,c,22,0
-d1_4,1,c,195,0
-d1_5,1,c,195,0
-d1_6,1,c,22,0
-d1_7,1,h,3,0
-d1_8,1,h,3,0
-d1_9,1,h,3,0
-d1_10,1,h,3,0
-d1_11,1,c,27,0
-d1_12,1,c,27,0
-d1_13,1,c,22,0
-d1_14,1,c,22,0
-d1_15,1,h,3,0
-d1_16,1,h,3,0
-d1_17,1,c,22,0
-d1_18,1,c,22,0
-d1_19,1,c,22,0
-d1_20,1,c,22,0
-d1_21,1,h,3,0
-d1_22,1,h,3,0
-d1_23,1,h,3,0
-d1_24,1,n,38,0
-d1_25,1,o,40,0
-d1_26,1,o,40,0
-d2_1,2,c,22,0
-d2_2,2,c,22,0
-d2_3,2,c,27,0
-d2_4,2,c,27,0
-d2_5,2,c,22,0
-d2_6,2,c,22,0
-d2_7,2,h,3,0
-d2_8,2,h,3,0
-d2_9,2,h,3,0
-d2_10,2,n,35,0
-d2_11,2,c,22,0
-d2_12,2,c,22,0
-d2_13,2,c,22,0
-d2_14,2,h,3,0
-d2_15,2,h,3,0
-d2_16,2,h,3,0
-d2_17,2,n,38,0
-d2_18,2,o,40,0
-d2_19,2,o,40,0
-d3_1,3,c,22,0
-d3_2,3,c,22,0
-d3_3,3,c,27,0
-d3_4,3,c,27,0
-d3_5,3,c,22,0
-d3_6,3,c,22,0
-d3_7,3,h,3,0
-d3_8,3,h,3,0
-d3_9,3,h,3,0
-d3_10,3,n,35,0
-d3_11,3,c,22,0
-d3_12,3,c,22,0
-d3_13,3,c,22,0
-d3_14,3,h,3,0
-d3_15,3,h,3,0
-d3_16,3,h,3,0
-d3_17,3,n,38,0
-d3_18,3,o,40,0
-d3_19,3,o,40,0
-d4_1,4,c,22,0
-d4_2,4,c,22,0
-d4_3,4,c,27,0
-d4_4,4,c,27,0
-d4_5,4,c,28,0
-d4_6,4,c,22,0
-d4_7,4,c,22,0
-d4_8,4,c,22,0
-d4_9,4,c,22,0
-d4_10,4,c,29,0
-d4_11,4,c,22,0
-d4_12,4,c,29,0
-d4_13,4,c,28,0
-d4_14,4,c,22,0
-d4_15,4,c,22,0
-d4_16,4,c,22,0
-d4_17,4,n,38,0
-d4_18,4,o,40,0
-d4_19,4,o,40,0
-d4_20,4,h,3,0
-d4_21,4,h,3,0
-d4_22,4,h,3,0
-d4_23,4,h,3,0
-d4_24,4,h,3,0
-d4_25,4,h,3,0
-d4_26,4,h,3,0
-d4_27,4,h,3,0
-d4_28,4,h,3,0
-d5_1,5,c,22,0
-d5_2,5,c,22,0
-d5_3,5,c,22,0
-d5_4,5,c,22,0
-d5_5,5,c,22,0
-d5_6,5,c,22,0
-d5_7,5,h,3,0
-d5_8,5,h,3,0
-d5_9,5,h,3,0
-d5_10,5,n,38,0
-d5_11,5,f,92,0
-d5_12,5,f,92,0
-d5_13,5,o,40,0
-d5_14,5,o,40,0
-d6_1,6,c,22,0
-d6_2,6,c,22,0
-d6_3,6,c,27,0
-d6_4,6,c,27,0
-d6_5,6,c,27,0
-d6_6,6,c,22,0
-d6_7,6,c,27,0
-d6_8,6,c,27,0
-d6_9,6,c,22,0
-d6_10,6,c,22,0
-d6_11,6,c,22,0
-d6_12,6,c,22,0
-d6_13,6,c,27,0
-d6_14,6,c,22,0
-d6_15,6,c,22,0
-d6_16,6,c,22,0
-d6_17,6,h,3,0
-d6_18,6,h,3,0
-d6_19,6,h,3,0
-d6_20,6,h,3,0
-d6_21,6,h,3,0
-d6_22,6,h,3,0
-d6_23,6,n,38,0
-d6_24,6,n,38,0
-d6_25,6,o,40,0
-d6_26,6,o,40,0
-d6_27,6,o,40,0
-d6_28,6,o,40,0
-d6_29,6,o,40,0
-d6_30,6,o,40,0
-d6_31,6,o,40,0
-d6_32,6,o,40,0
-d6_33,6,n,38,0
-d6_34,6,n,38,0
-d7_1,7,c,22,0
-d7_2,7,c,22,0
-d7_3,7,c,22,0
-d7_4,7,c,29,0
-d7_5,7,c,22,0
-d7_6,7,c,22,0
-d7_7,7,h,3,0
-d7_8,7,h,3,0
-d7_9,7,h,3,0
-d7_10,7,h,3,0
-d7_11,7,h,3,0
-d7_12,7,c,29,0
-d7_13,7,c,22,0
-d7_14,7,c,22,0
-d7_15,7,c,22,0
-d7_16,7,c,22,0
-d7_17,7,c,22,0
-d7_18,7,h,3,0
-d7_19,7,h,3,0
-d7_20,7,h,3,0
-d7_21,7,c,10,0
-d7_22,7,h,3,0
-d7_23,7,h,3,0
-d7_24,7,h,3,0
-d7_25,7,n,38,0
-d7_26,7,o,40,0
-d7_27,7,o,40,0
-d8_1,8,c,22,0
-d8_2,8,c,22,0
-d8_3,8,c,22,0
-d8_4,8,c,29,0
-d8_5,8,c,22,0
-d8_6,8,c,22,0
-d8_7,8,c,22,0
-d8_8,8,c,22,0
-d8_9,8,c,22,0
-d8_10,8,c,22,0
-d8_11,8,c,22,0
-d8_12,8,c,29,0
-d8_13,8,c,10,0
-d8_14,8,n,38,0
-d8_15,8,o,40,0
-d8_16,8,o,40,0
-d8_17,8,h,3,0
-d8_18,8,h,3,0
-d8_19,8,h,3,0
-d8_20,8,h,3,0
-d8_21,8,h,3,0
-d8_22,8,h,3,0
-d8_23,8,h,3,0
-d8_24,8,h,3,0
-d8_25,8,o,49,0
-d8_26,8,c,14,0
-d8_27,8,c,10,0
-d8_28,8,h,3,0
-d8_29,8,h,3,0
-d8_30,8,h,3,0
-d8_31,8,o,51,0
-d9_1,9,c,22,0
-d9_2,9,c,22,0
-d9_3,9,c,26,0
-d9_4,9,c,26,0
-d9_5,9,c,22,0
-d9_6,9,c,22,0
-d9_7,9,n,34,0
-d9_8,9,c,21,0
-d9_9,9,n,34,0
-d9_10,9,n,38,0
-d9_11,9,o,40,0
-d9_12,9,o,40,0
-d9_13,9,h,3,0
-d9_14,9,h,3,0
-d9_15,9,h,3,0
-d9_16,9,h,3,0
-d9_17,9,h,1,0
-d10_1,10,c,22,0
-d10_2,10,c,22,0
-d10_3,10,c,22,0
-d10_4,10,c,29,0
-d10_5,10,c,22,0
-d10_6,10,c,22,0
-d10_7,10,c,22,0
-d10_8,10,c,22,0
-d10_9,10,c,22,0
-d10_10,10,c,22,0
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
