Changeset: cf4e4c5a1bb9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cf4e4c5a1bb9
Modified Files:
monetdb5/optimizer/opt_pipes.c
tools/mserver/mserver5.1.in
Branch: Apr2019
Log Message:
Add missing optimizer set in sequential pipe.
diffs (51 lines):
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
@@ -193,6 +193,7 @@ static struct PIPELINES {
"optimizer.remap();"
"optimizer.costModel();"
"optimizer.coercions();"
+ "optimizer.aliases();"
"optimizer.evaluate();"
"optimizer.emptybind();"
"optimizer.pushselect();"
diff --git a/tools/mserver/mserver5.1.in b/tools/mserver/mserver5.1.in
--- a/tools/mserver/mserver5.1.in
+++ b/tools/mserver/mserver5.1.in
@@ -278,9 +278,7 @@ the dependency information maintained in
ensure there are no conflicts and at least the pre-requisite
optimizers are used.
The setting of sql_optimizer can be either the list of optimizers to
-run, or one or more variables containing the optimizer pipeline to
run.
-The latter is provided for readability purposes only.
Default:
.BR default_pipe .
.P
@@ -295,7 +293,7 @@ minimal_pipe=inline,remap,deadcode,multi
The default pipeline contains the mitosis-mergetable-reorder
optimizers, aimed at large tables and improved access locality.
.\" this documentation must be kept in sync with the respective code in
monetdb5/optimizer/opt_pipes.c
-default_pipe=inline,remap,costModel,coercions,evaluate,emptybind,pushselect,aliases,mitosis,mergetable,deadcode,aliases,constants,commonTerms,projectionpath,deadcode,reorder,matpack,dataflow,querylog,multiplex,generator,profiler,candidates,postfix,deadcode,wlc,garbageCollector
+default_pipe=inline,remap,costModel,coercions,aliases,evaluate,emptybind,pushselect,aliases,mitosis,mergetable,deadcode,aliases,constants,commonTerms,projectionpath,deadcode,reorder,matpack,dataflow,querylog,multiplex,generator,profiler,candidates,postfix,deadcode,wlc,garbageCollector
.TP
.B no_mitosis_pipe
The no_mitosis pipeline is identical to the default pipeline, except
@@ -304,7 +302,7 @@ It is used mainly to make some tests wor
check/debug whether "unexpected" problems are related to mitosis
(and/or mergetable).
.\" this documentation must be kept in sync with the respective code in
monetdb5/optimizer/opt_pipes.c
-no_mitosis_pipe=inline,remap,costModel,coercions,evaluate,emptybind,pushselect,aliases,mergetable,deadcode,aliases,constants,commonTerms,projectionpath,deadcode,reorder,matpack,dataflow,querylog,multiplex,generator,profiler,candidates,postfix,deadcode,wlc,garbageCollector
+no_mitosis_pipe=inline,remap,costModel,coercions,aliases,evaluate,emptybind,pushselect,aliases,mergetable,deadcode,aliases,constants,commonTerms,projectionpath,deadcode,reorder,matpack,dataflow,querylog,multiplex,generator,profiler,candidates,postfix,deadcode,wlc,garbageCollector
.TP
.B sequential_pipe
The sequential pipeline is identical to the default pipeline, except
@@ -312,7 +310,7 @@ that optimizers mitosis & dataflow are o
It is use mainly to make some tests work deterministically, i.e.,
avoid ambigious output, by avoiding parallelism.
.\" this documentation must be kept in sync with the respective code in
monetdb5/optimizer/opt_pipes.c
-sequential_pipe=inline,remap,costModel,coercions,evaluate,emptybind,pushselect,aliases,mergetable,deadcode,aliases,constants,commonTerms,projectionpath,deadcode,reorder,matpack,querylog,multiplex,generator,profiler,candidates,postfix,deadcode,wlc,garbageCollector
+sequential_pipe=inline,remap,costModel,coercions,aliases,evaluate,emptybind,pushselect,aliases,mergetable,deadcode,aliases,constants,commonTerms,projectionpath,deadcode,reorder,matpack,querylog,multiplex,generator,profiler,candidates,postfix,deadcode,wlc,garbageCollector
.SH CONFIG FILE FORMAT
The configuration file readable by
.I mserver5
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
