Changeset: bbffe3462191 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bbffe3462191
Modified Files:
monetdb5/optimizer/opt_pipes.c
tools/mserver/mserver5.1.in
Branch: Mar2018
Log Message:
re-align optimizer order in no_mitosis_pie & sequential_pipe with default_pipe
order got dis-aligned with changeset 6d8a941642bd
diffs (44 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
@@ -158,8 +158,8 @@ static struct PIPELINES {
"optimizer.constants();"
"optimizer.commonTerms();"
"optimizer.projectionpath();"
+ "optimizer.deadcode();"
"optimizer.reorder();"
- "optimizer.deadcode();"
// "optimizer.reduce();" deprecated
"optimizer.matpack();"
"optimizer.dataflow();"
@@ -200,8 +200,8 @@ static struct PIPELINES {
"optimizer.constants();"
"optimizer.commonTerms();"
"optimizer.projectionpath();"
+ "optimizer.deadcode();"
"optimizer.reorder();"
- "optimizer.deadcode();"
// "optimizer.reduce();" deprecated
"optimizer.matpack();"
"optimizer.querylog();"
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
@@ -292,7 +292,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,reorder,deadcode,matpack,dataflow,querylog,multiplex,generator,profiler,candidates,garbageCollector
+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,garbageCollector
.TP
.B sequential_pipe
The sequential pipeline is identical to the default pipeline, except
@@ -300,7 +300,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,reorder,deadcode,matpack,querylog,multiplex,generator,profiler,candidates,garbageCollector
+sequential_pipe=inline,remap,costModel,coercions,evaluate,emptybind,pushselect,aliases,mergetable,deadcode,aliases,constants,commonTerms,projectionpath,deadcode,reorder,matpack,querylog,multiplex,generator,profiler,candidates,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
