Changeset: 243d4be496c4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=243d4be496c4
Modified Files:
monetdb5/optimizer/opt_pipes.c
tools/mserver/mserver5.1.in
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (72 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
@@ -49,7 +49,12 @@ struct PIPELINES {
MalBlkPtr mb;
char builtin;
} pipes[MAXOPTPIPES] = {
-/* The minimal pipeline necessary by the server to operate correctly*/
+/* The minimal pipeline necessary by the server to operate correctly
+ *
+ * NOTE:
+ * If you change the minimal pipe, please also update the man page
+ * (see tools/mserver/mserver5.1) accordingly!
+ */
{"minimal_pipe",
"optimizer.inline();"
"optimizer.remap();"
@@ -95,6 +100,10 @@ struct PIPELINES {
* used mainly to make some tests work deterministically, and to check
* / debug whether "unexpected" problems are related to mitosis
* (and/or mergetable).
+ *
+ * NOTE:
+ * If you change the no_mitosis pipe, please also update the man page
+ * (see tools/mserver/mserver5.1) accordingly!
*/
{"no_mitosis_pipe",
"optimizer.inline();"
@@ -124,6 +133,10 @@ struct PIPELINES {
* omitted. It is use mainly to make some tests work
* deterministically, i.e., avoid ambigious output, by avoiding
* parallelism.
+ *
+ * NOTE:
+ * If you change the sequential pipe, please also update the man page
+ * (see tools/mserver/mserver5.1) accordingly!
*/
{"sequential_pipe",
"optimizer.inline();"
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
@@ -283,11 +283,13 @@ The following are possible pipes to use:
.TP
.B minimal_pipe
The minimal pipeline necessary by the server to operate correctly.
+.\" this documentation must be kept in sync with the respective code in
monetdb5/optimizer/opt_pipes.c
minimal_pipe=inline,remap,deadcode,multiplex,garbageCollector
.TP
.B default_pipe
The default pipe line 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,emptySet,aliases,pushselect,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,matpack,dataflow,querylog,multiplex,garbageCollector
.TP
.B no_mitosis_pipe
@@ -296,6 +298,7 @@ that optimizer mitosis is omitted.
It is used mainly to make some tests work deterministically, and to
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,emptySet,aliases,pushselect,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,matpack,dataflow,querylog,multiplex,garbageCollector
.TP
.B sequential_pipe
@@ -303,6 +306,7 @@ The sequential pipe line is identical to
that optimizers mitosis & dataflow are omitted.
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,emptySet,aliases,pushselect,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,matpack,querylog,multiplex,garbageCollector
.SH CONFIG FILE FORMAT
The configuration file readable by
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
