Changeset: 1605677f82eb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1605677f82eb
Modified Files:
monetdb5/optimizer/opt_pipes.c
Branch: Apr2012
Log Message:
Run through indent.
diffs (truncated from 1111 to 300 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
@@ -41,387 +41,375 @@
#define MAXOPTPIPES 64
-struct PIPELINES{
+struct PIPELINES {
char *name;
char *def;
char *status;
char *prerequisite;
MalBlkPtr mb;
-} pipes[MAXOPTPIPES] ={
+} pipes[MAXOPTPIPES] = {
/* The minimal pipeline necessary by the server to operate correctly*/
-{ "minimal_pipe",
- "optimizer.inline();"
- "optimizer.remap();"
- "optimizer.deadcode();"
- "optimizer.multiplex();"
- "optimizer.garbageCollector();",
- "stable",0,0},
-
-/*
- * The default pipe line contains as of Feb2010 mitosis-mergetable-reorder,
- * aimed at large tables and improved access locality
+ {"minimal_pipe",
+ "optimizer.inline();"
+ "optimizer.remap();"
+ "optimizer.deadcode();"
+ "optimizer.multiplex();"
+ "optimizer.garbageCollector();",
+ "stable", 0, 0},
+/* The default pipe line contains as of Feb2010
+ * mitosis-mergetable-reorder, aimed at large tables and improved
+ * access locality
+ */
+ {"default_pipe",
+ "optimizer.inline();"
+ "optimizer.remap();"
+ "optimizer.evaluate();"
+ "optimizer.costModel();"
+ "optimizer.coercions();"
+ "optimizer.emptySet();"
+ "optimizer.aliases();"
+ "optimizer.mitosis();"
+ "optimizer.mergetable();"
+ "optimizer.deadcode();"
+ "optimizer.commonTerms();"
+ "optimizer.joinPath();"
+ "optimizer.reorder();"
+ "optimizer.deadcode();"
+ "optimizer.reduce();"
+ "optimizer.dataflow();"
+ "optimizer.history();"
+ "optimizer.multiplex();"
+ "optimizer.accumulators();"
+ "optimizer.garbageCollector();",
+ "stable", 0, 0},
+/* 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
+ * / debug whether "unexpected" problems are related to mitosis
+ * (and/or mergetable).
+ */
+ {"no_mitosis_pipe",
+ "optimizer.inline();"
+ "optimizer.remap();"
+ "optimizer.evaluate();"
+ "optimizer.costModel();"
+ "optimizer.coercions();"
+ "optimizer.emptySet();"
+ "optimizer.aliases();"
+ "optimizer.mergetable();"
+ "optimizer.deadcode();"
+ "optimizer.commonTerms();"
+ "optimizer.joinPath();"
+ "optimizer.reorder();"
+ "optimizer.deadcode();"
+ "optimizer.reduce();"
+ "optimizer.dataflow();"
+ "optimizer.history();"
+ "optimizer.multiplex();"
+ "optimizer.accumulators();"
+ "optimizer.garbageCollector();",
+ "stable", 0, 0},
+/* The sequential pipe line is (and should be kept!) identical to the
+ * default pipeline, except that optimizers mitosis & dataflow are
+ * omitted. It is use mainly to make some tests work
+ * deterministically, i.e., avoid ambigious output, by avoiding
+ * parallelism.
+ */
+ {"sequential_pipe",
+ "optimizer.inline();"
+ "optimizer.remap();"
+ "optimizer.evaluate();"
+ "optimizer.costModel();"
+ "optimizer.coercions();"
+ "optimizer.emptySet();"
+ "optimizer.aliases();"
+ "optimizer.mergetable();"
+ "optimizer.deadcode();"
+ "optimizer.commonTerms();"
+ "optimizer.joinPath();"
+ "optimizer.reorder();"
+ "optimizer.deadcode();"
+ "optimizer.reduce();"
+ "optimizer.history();"
+ "optimizer.multiplex();"
+ "optimizer.accumulators();"
+ "optimizer.garbageCollector();",
+ "stable", 0, 0},
+/* The default pipeline used in the November 2009 release
+ {"nov2009_pipe",
+ "optimizer.inline();"
+ "optimizer.remap();"
+ "optimizer.evaluate();"
+ "optimizer.costModel();"
+ "optimizer.coercions();"
+ "optimizer.emptySet();"
+ "optimizer.aliases();"
+ "optimizer.mergetable();"
+ "optimizer.deadcode();"
+ "optimizer.constants();"
+ "optimizer.commonTerms();"
+ "optimizer.joinPath();"
+ "optimizer.deadcode();"
+ "optimizer.reduce();"
+ "optimizer.dataflow();"
+ "optimizer.history();"
+ "optimizer.multiplex();"
+ "optimizer.garbageCollector();",
+ "stable", 0, 0},
+ */
+/* Experimental pipelines stressing various components under
+ * development. Do not use any of these pipelines in production
+ * settings!
+ */
+/* Not yet compiled
+ {"replication_pipe",
+ "optimizer.inline();"
+ "optimizer.remap();"
+ "optimizer.evaluate();"
+ "optimizer.costModel();"
+ "optimizer.coercions();"
+ "optimizer.emptySet();"
+ "optimizer.aliases();"
+ "optimizer.mergetable();"
+ "optimizer.deadcode();"
+ "optimizer.constants();"
+ "optimizer.commonTerms();"
+ "optimizer.joinPath();"
+ "optimizer.deadcode();"
+ "optimizer.reduce();"
+ "optimizer.dataflow();"
+ "optimizer.history();"
+ "optimizer.replication();"
+ "optimizer.multiplex();"
+ "optimizer.garbageCollector();",
+ "experimental", 0, 0},
*/
-{ "default_pipe",
- "optimizer.inline();"
- "optimizer.remap();"
- "optimizer.evaluate();"
- "optimizer.costModel();"
- "optimizer.coercions();"
- "optimizer.emptySet();"
- "optimizer.aliases();"
- "optimizer.mitosis();"
- "optimizer.mergetable();"
- "optimizer.deadcode();"
- "optimizer.commonTerms();"
- "optimizer.joinPath();"
- "optimizer.reorder();"
- "optimizer.deadcode();"
- "optimizer.reduce();"
- "optimizer.dataflow();"
- "optimizer.history();"
- "optimizer.multiplex();"
- "optimizer.accumulators();"
- "optimizer.garbageCollector();",
- "stable",0,0},
-
-/*
- * 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 / debug whether "unexpected" problems are
related to
- * mitosis (and/or mergetable).
-*/
-{ "no_mitosis_pipe",
- "optimizer.inline();"
- "optimizer.remap();"
- "optimizer.evaluate();"
- "optimizer.costModel();"
- "optimizer.coercions();"
- "optimizer.emptySet();"
- "optimizer.aliases();"
- "optimizer.mergetable();"
- "optimizer.deadcode();"
- "optimizer.commonTerms();"
- "optimizer.joinPath();"
- "optimizer.reorder();"
- "optimizer.deadcode();"
- "optimizer.reduce();"
- "optimizer.dataflow();"
- "optimizer.history();"
- "optimizer.multiplex();"
- "optimizer.accumulators();"
- "optimizer.garbageCollector();",
- "stable",0,0},
-
-/* The sequential pipe line is (and should be kept!) identical to the default
pipeline,
- * except that optimizers mitosis & dataflow are omitted. It is use mainly to
make some
- * tests work deterministically, i.e., avoid ambigious output, by avoiding
parallelism.
-*/
-{ "sequential_pipe",
- "optimizer.inline();"
- "optimizer.remap();"
- "optimizer.evaluate();"
- "optimizer.costModel();"
- "optimizer.coercions();"
- "optimizer.emptySet();"
- "optimizer.aliases();"
- "optimizer.mergetable();"
- "optimizer.deadcode();"
- "optimizer.commonTerms();"
- "optimizer.joinPath();"
- "optimizer.reorder();"
- "optimizer.deadcode();"
- "optimizer.reduce();"
- "optimizer.history();"
- "optimizer.multiplex();"
- "optimizer.accumulators();"
- "optimizer.garbageCollector();",
- "stable", 0,0 },
-
-/* The default pipeline used in the November 2009 release
-{ "nov2009_pipe",
- "optimizer.inline();"
- "optimizer.remap();"
- "optimizer.evaluate();"
- "optimizer.costModel();"
- "optimizer.coercions();"
- "optimizer.emptySet();"
- "optimizer.aliases();"
- "optimizer.mergetable();"
- "optimizer.deadcode();"
- "optimizer.constants();"
- "optimizer.commonTerms();"
- "optimizer.joinPath();"
- "optimizer.deadcode();"
- "optimizer.reduce();"
- "optimizer.dataflow();"
- "optimizer.history();"
- "optimizer.multiplex();"
- "optimizer.garbageCollector();",
- "stable",0,0},
-*/
-
-/*
- * Experimental pipelines stressing various components under development
- * Do not use any of these pipelines in production settings!
-*/
-/* Not yet compiled
-{"replication_pipe",
- "optimizer.inline();"
- "optimizer.remap();"
- "optimizer.evaluate();"
- "optimizer.costModel();"
- "optimizer.coercions();"
- "optimizer.emptySet();"
- "optimizer.aliases();"
- "optimizer.mergetable();"
- "optimizer.deadcode();"
- "optimizer.constants();"
- "optimizer.commonTerms();"
- "optimizer.joinPath();"
- "optimizer.deadcode();"
- "optimizer.reduce();"
- "optimizer.dataflow();"
- "optimizer.history();"
- "optimizer.replication();"
- "optimizer.multiplex();"
- "optimizer.garbageCollector();",
- "experimental",0,0 },
-*/
-
-{"accumulator_pipe",
- "optimizer.inline();"
- "optimizer.remap();"
- "optimizer.evaluate();"
- "optimizer.costModel();"
- "optimizer.coercions();"
- "optimizer.emptySet();"
- "optimizer.aliases();"
- "optimizer.mergetable();"
- "optimizer.deadcode();"
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
