Changeset: dc618b7aeec7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/dc618b7aeec7
Branch: properties
Log Message:
Merged with default
diffs (120 lines):
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -62104,21 +62104,6 @@ pattern optimizer.strimps(X_0:str, X_1:s
OPTwrapper;
Use strimps index if appropriate
optimizer
-volcano
-pattern optimizer.volcano():str
-OPTwrapper;
-(empty)
-optimizer
-volcano
-pattern optimizer.volcano(X_0:str, X_1:str):str
-OPTwrapper;
-Simulate volcano style execution
-optimizer
-volcano_pipe
-function optimizer.volcano_pipe():void;
-(empty)
-(empty)
-optimizer
wlc
pattern optimizer.wlc():str
OPTwrapper;
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -45619,21 +45619,6 @@ pattern optimizer.strimps(X_0:str, X_1:s
OPTwrapper;
Use strimps index if appropriate
optimizer
-volcano
-pattern optimizer.volcano():str
-OPTwrapper;
-(empty)
-optimizer
-volcano
-pattern optimizer.volcano(X_0:str, X_1:str):str
-OPTwrapper;
-Simulate volcano style execution
-optimizer
-volcano_pipe
-function optimizer.volcano_pipe():void;
-(empty)
-(empty)
-optimizer
wlc
pattern optimizer.wlc():str
OPTwrapper;
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -356,6 +356,11 @@ void IMPSdestroy(BAT *b);
lng IMPSimprintsize(BAT *b);
int MT_access(const char *pathname, int mode);
int MT_check_nr_cores(void);
+void MT_cond_broadcast(MT_Cond *cond);
+void MT_cond_destroy(MT_Cond *cond);
+void MT_cond_init(MT_Cond *cond);
+void MT_cond_signal(MT_Cond *cond);
+void MT_cond_wait(MT_Cond *cond, MT_Lock *lock);
int MT_create_thread(MT_Id *t, void (*function)(void *), void *arg, enum
MT_thr_detach d, const char *threadname);
void MT_exiting_thread(void);
FILE *MT_fopen(const char *filename, const char *mode);
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -1,3 +1,6 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Thu Apr 28 2022 Pedro Ferreira <pedro.ferre...@monetdbsolutions.com>
+- Disabled volcano pipeline due to known issues.
+
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
@@ -162,6 +162,8 @@ static struct PIPELINES {
{"default_fast",
"optimizer.defaultfast()",
"stable", NULL, 1},
+/* Apr2022 update. I disabled the volcano_pipe because it has issues on it */
+#if 0
/*
* Volcano style execution produces a sequence of blocks from the source
relation
*/
@@ -200,6 +202,7 @@ static struct PIPELINES {
"optimizer.garbageCollector();"
"optimizer.profiler();",
"stable", NULL, 1},
+#endif
/* The no_mitosis pipe line is (and should be kept!) identical to the
* default pipeline, except that optimizer mitosis is omitted. It is
* used mainly to make some tests work deterministically, and to check
diff --git a/monetdb5/optimizer/optimizer.c b/monetdb5/optimizer/optimizer.c
--- a/monetdb5/optimizer/optimizer.c
+++ b/monetdb5/optimizer/optimizer.c
@@ -89,7 +89,7 @@ static mel_func optimizer_init_funcs[] =
optwrapper_pattern("coercions", "Handle simple type coercions"),
optwrapper_pattern("commonTerms", "Common sub-expression optimizer"),
optwrapper_pattern("candidates", "Mark candidate list variables"),
- optwrapper_pattern("volcano", "Simulate volcano style execution"),
+ /* optwrapper_pattern("volcano", "Simulate volcano style execution"), Apr2022
update. I disabled the volcano_pipe because it has issues on it */
optwrapper_pattern("constants", "Duplicate constant removal optimizer"),
optwrapper_pattern("profiler", "Collect properties for the profiler"),
optwrapper_pattern("costModel", "Estimate the cost of a relational
expression"),
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
@@ -40,9 +40,6 @@ stable
default_fast
optimizer.defaultfast()
stable
-volcano_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.matpack();optimizer.reorder();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.volcano();optimizer.candidates();optimizer.deadcode();optimizer.postfix();optimizer.wlc();optimizer.garbageCollector();optimizer.profiler();
-stable
no_mitosis_pipe
optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.aliases();optimizer.evaluate();optimizer.emptybind();optimizer.deadcode();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.bincopyfrom();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.matpack();optimizer.reorder();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 -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
