Changeset: f5e79b9fd880 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f5e79b9fd880
Branch: Jul2021
Log Message:
merged
diffs (truncated from 328 to 300 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -680,7 +680,7 @@ BATappend2(BAT *b, BAT *n, BAT *s, bool
ALIGNapp(b, force, GDK_FAIL);
if (ATOMstorage(ATOMtype(b->ttype)) != ATOMstorage(ATOMtype(n->ttype)))
{
- GDKerror("Incompatible operands.\n");
+ GDKerror("Incompatible operands ("ALGOBATFMT" vs.
"ALGOBATFMT").\n", ALGOBATPAR(b), ALGOBATPAR(n));
return GDK_FAIL;
}
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1185,6 +1185,8 @@ BBPtrim(bool aggressive)
if (!aggressive)
flag |= BBPHOT;
for (bat bid = 1, nbat = (bat) ATOMIC_GET(&BBPsize); bid < nbat; bid++)
{
+ /* don't do this during a (sub)commit */
+ MT_lock_set(&GDKtmLock);
MT_lock_set(&GDKswapLock(bid));
BAT *b = NULL;
bool swap = false;
@@ -1210,6 +1212,7 @@ BBPtrim(bool aggressive)
GDKerror("unload failed for bat %d", bid);
n++;
}
+ MT_lock_unset(&GDKtmLock);
}
TRC_DEBUG(BAT_, "unloaded %d bats%s\n", n, aggressive ? " (also hot)" :
"");
}
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -51,8 +51,8 @@ static struct PIPELINES {
"optimizer.generator();"
//"optimizer.candidates();" only for decoration in explain
//"optimizer.mask();"
- "optimizer.garbageCollector();",
- "optimizer.profiler();"
+ "optimizer.garbageCollector();"
+ "optimizer.profiler();",
"stable", NULL, 1},
{"minimal_fast",
"optimizer.minimalfast()",
@@ -97,8 +97,8 @@ static struct PIPELINES {
"optimizer.postfix();"
// "optimizer.jit();" awaiting the new batcalc api
"optimizer.wlc();"
- "optimizer.garbageCollector();",
- "optimizer.profiler();"
+ "optimizer.garbageCollector();"
+ "optimizer.profiler();",
"stable", NULL, 1},
{"default_fast",
"optimizer.defaultfast()",
@@ -139,8 +139,8 @@ static struct PIPELINES {
// "optimizer.jit();" awaiting the new batcalc api
"optimizer.oltp();"
"optimizer.wlc();"
- "optimizer.garbageCollector();",
- "optimizer.profiler();"
+ "optimizer.garbageCollector();"
+ "optimizer.profiler();",
"stable", NULL, 1},
/*
* Volcano style execution produces a sequence of blocks from the source
relation
@@ -177,8 +177,8 @@ static struct PIPELINES {
"optimizer.postfix();"
// "optimizer.jit();" awaiting the new batcalc api
"optimizer.wlc();"
- "optimizer.garbageCollector();",
- "optimizer.profiler();"
+ "optimizer.garbageCollector();"
+ "optimizer.profiler();",
"stable", NULL, 1},
/* The no_mitosis pipe line is (and should be kept!) identical to the
* default pipeline, except that optimizer mitosis is omitted. It is
@@ -220,8 +220,8 @@ static struct PIPELINES {
"optimizer.postfix();"
// "optimizer.jit();" awaiting the new batcalc api
"optimizer.wlc();"
- "optimizer.garbageCollector();",
- "optimizer.profiler();"
+ "optimizer.garbageCollector();"
+ "optimizer.profiler();",
"stable", NULL, 1},
/* The sequential pipe line is (and should be kept!) identical to the
* default pipeline, except that optimizers mitosis & dataflow are
@@ -262,8 +262,8 @@ static struct PIPELINES {
"optimizer.postfix();"
// "optimizer.jit();" awaiting the new batcalc api
"optimizer.wlc();"
- "optimizer.garbageCollector();",
- "optimizer.profiler();"
+ "optimizer.garbageCollector();"
+ "optimizer.profiler();",
"stable", NULL, 1},
/* Experimental pipelines stressing various components under
* development. Do not use any of these pipelines in production
diff --git
a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.test
b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.test
--- a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.test
+++ b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.test
@@ -239,6 +239,8 @@ algebra.sort
1
bat.pack
5
+optimizer.profiler
+1
querylog.define
1
sql.bind
@@ -267,6 +269,8 @@ algebra.subslice
1
bat.pack
5
+optimizer.profiler
+1
querylog.define
1
sql.bind
@@ -297,6 +301,8 @@ algebra.subslice
1
bat.pack
5
+optimizer.profiler
+1
querylog.define
1
sql.bind
@@ -327,6 +333,8 @@ algebra.subslice
1
bat.pack
5
+optimizer.profiler
+1
querylog.define
1
sql.bind
@@ -357,6 +365,8 @@ algebra.subslice
1
bat.pack
5
+optimizer.profiler
+1
querylog.define
1
sql.bind
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.test
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.test
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.test
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.test
@@ -22,6 +22,8 @@ algebra.sort
1
bat.pack
5
+optimizer.profiler
+1
querylog.define
1
sql.bind
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.test
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.test
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.test
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.test
@@ -26,6 +26,8 @@ algebra.sort
1
bat.pack
5
+optimizer.profiler
+1
querylog.define
1
sql.bind
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.test
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.test
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.test
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.test
@@ -22,6 +22,8 @@ algebra.sort
1
bat.pack
5
+optimizer.profiler
+1
querylog.define
1
sql.bind
@@ -58,6 +60,8 @@ bat.new
2
bat.pack
5
+optimizer.profiler
+1
querylog.define
1
sql.bind
@@ -96,6 +100,8 @@ bat.new
2
bat.pack
5
+optimizer.profiler
+1
querylog.define
1
sql.bind
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.test
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.test
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.test
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.test
@@ -22,6 +22,8 @@ algebra.sort
1
bat.pack
5
+optimizer.profiler
+1
querylog.define
1
sql.bind
@@ -58,6 +60,8 @@ bat.new
2
bat.pack
5
+optimizer.profiler
+1
querylog.define
1
sql.bind
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.test
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.test
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.test
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.test
@@ -22,6 +22,8 @@ algebra.sort
1
bat.pack
5
+optimizer.profiler
+1
querylog.define
1
sql.bind
@@ -58,6 +60,8 @@ bat.new
2
bat.pack
5
+optimizer.profiler
+1
querylog.define
1
sql.bind
@@ -96,6 +100,8 @@ bat.new
4
bat.pack
5
+optimizer.profiler
+1
querylog.define
1
sql.bind
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.test
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.test
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.test
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.test
@@ -22,6 +22,8 @@ algebra.sort
1
bat.pack
5
+optimizer.profiler
+1
querylog.define
1
sql.bind
@@ -58,6 +60,8 @@ bat.new
4
bat.pack
5
+optimizer.profiler
+1
querylog.define
1
sql.bind
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-prologue.test
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-prologue.test
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-prologue.test
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-prologue.test
@@ -451,4 +451,3 @@ 1
statement ok
rollback
-
diff --git a/sql/test/Tests/setoptimizer.test b/sql/test/Tests/setoptimizer.test
--- a/sql/test/Tests/setoptimizer.test
+++ b/sql/test/Tests/setoptimizer.test
@@ -29,29 +29,29 @@ query TTT nosort
select * from optimizers()
----
minimal_pipe
-optimizer.inline();optimizer.remap();optimizer.bincopyfrom();optimizer.deadcode();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();
-optimizer.profiler();stable
+optimizer.inline();optimizer.remap();optimizer.bincopyfrom();optimizer.deadcode();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();optimizer.profiler();
+stable
minimal_fast
optimizer.minimalfast()
stable
default_pipe
-optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.aliases();optimizer.evaluate();optimizer.emptybind();optimizer.deadcode();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.bincopyfrom();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.candidates();optimizer.deadcode();optimizer.postfix();optimizer.wlc();optimizer.garbageCollector();
-optimizer.profiler();stable
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
