Changeset: 5d9fa3b99811 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d9fa3b99811
Modified Files:
monetdb5/optimizer/opt_pipes.c
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/setoptimizer.stable.out
tools/mserver/mserver5.1
Branch: Feb2013
Log Message:
re-aligned sequential- & no_mitosis-pipe with detault-pipe,
updated mserver5 man page,
approved updated stable output accordingly.
diffs (282 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
@@ -59,7 +59,12 @@ struct PIPELINES {
"stable", NULL, NULL, 1},
/* The default pipe line contains as of Feb2010
* mitosis-mergetable-reorder, aimed at large tables and improved
- * access locality
+ * access locality.
+ *
+ * NOTE:
+ * If you change the default pipe, please also update the no_mitosis pipe
+ * and sequential pipe (see below, as well as the man page (see
+ * tools/mserver/mserver5.1) accordingly!
*/
{"default_pipe",
"optimizer.inline();"
@@ -108,6 +113,7 @@ struct PIPELINES {
"optimizer.reorder();"
"optimizer.deadcode();"
"optimizer.reduce();"
+ "optimizer.matpack();"
"optimizer.dataflow();"
"optimizer.history();"
"optimizer.multiplex();"
@@ -136,6 +142,7 @@ struct PIPELINES {
"optimizer.reorder();"
"optimizer.deadcode();"
"optimizer.reduce();"
+ "optimizer.matpack();"
"optimizer.history();"
"optimizer.multiplex();"
"optimizer.garbageCollector();",
diff --git
a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
--- a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
+++ b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
@@ -43,8 +43,8 @@ function user.s1_1{autoCommit=true}(A0:f
X_15 := sql.delta(X_7,X_10,r1_10,X_13);
X_16 := algebra.leftfetchjoin(X_4,X_15);
X_17 := batcalc.flt(X_16);
- X_36 := batmmath.log10(X_17);
- X_18 := algebra.thetasubselect(X_36,A0,">");
+ X_37 := batmmath.log10(X_17);
+ X_18 := algebra.thetasubselect(X_37,A0,">");
X_20 := algebra.leftfetchjoin(X_18,X_16);
X_21 := sql.resultSet(1,1,X_20);
sql.rsColumn(X_21,"sys.tab_2826","d","double",53,0,X_20);
diff --git
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
---
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
+++
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
@@ -34,12 +34,12 @@ function user.s0_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","functions");
- X_44 := algebra.likesubselect(X_6,X_3,A0,"":str,false);
+ X_45 := algebra.likesubselect(X_6,X_3,A0,"":str,false);
(X_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
- X_45 := algebra.likesubselect(r1_9,A0,"":str,false);
+ X_46 := algebra.likesubselect(r1_9,A0,"":str,false);
X_12 := sql.bind(X_2,"sys","functions","name",1);
- X_46 := algebra.likesubselect(X_12,X_3,A0,"":str,false);
- X_14 := sql.subdelta(X_44,X_9,X_45,X_46);
+ X_47 := algebra.likesubselect(X_12,X_3,A0,"":str,false);
+ X_14 := sql.subdelta(X_45,X_9,X_46,X_47);
X_16 := sql.projectdelta(X_14,X_6,X_9,r1_9,X_12);
X_17 := sql.bind(X_2,"sys","functions","func",0);
(X_19,r1_28) := sql.bind(X_2,"sys","functions","func",2);
@@ -60,12 +60,12 @@ function user.s1_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","functions");
- X_44 := algebra.likesubselect(X_6,X_3,A0,"":str,true);
+ X_45 := algebra.likesubselect(X_6,X_3,A0,"":str,true);
(X_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
- X_45 := algebra.likesubselect(r1_9,A0,"":str,true);
+ X_46 := algebra.likesubselect(r1_9,A0,"":str,true);
X_12 := sql.bind(X_2,"sys","functions","name",1);
- X_46 := algebra.likesubselect(X_12,X_3,A0,"":str,true);
- X_14 := sql.subdelta(X_44,X_9,X_45,X_46);
+ X_47 := algebra.likesubselect(X_12,X_3,A0,"":str,true);
+ X_14 := sql.subdelta(X_45,X_9,X_46,X_47);
X_16 := sql.projectdelta(X_14,X_6,X_9,r1_9,X_12);
X_17 := sql.bind(X_2,"sys","functions","func",0);
(X_19,r1_28) := sql.bind(X_2,"sys","functions","func",2);
@@ -86,12 +86,12 @@ function user.s2_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","functions");
- X_44 := algebra.ilikesubselect(X_6,X_3,A0,"":str,false);
+ X_45 := algebra.ilikesubselect(X_6,X_3,A0,"":str,false);
(X_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
- X_45 := algebra.ilikesubselect(r1_9,A0,"":str,false);
+ X_46 := algebra.ilikesubselect(r1_9,A0,"":str,false);
X_12 := sql.bind(X_2,"sys","functions","name",1);
- X_46 := algebra.ilikesubselect(X_12,X_3,A0,"":str,false);
- X_14 := sql.subdelta(X_44,X_9,X_45,X_46);
+ X_47 := algebra.ilikesubselect(X_12,X_3,A0,"":str,false);
+ X_14 := sql.subdelta(X_45,X_9,X_46,X_47);
X_16 := sql.projectdelta(X_14,X_6,X_9,r1_9,X_12);
X_17 := sql.bind(X_2,"sys","functions","func",0);
(X_19,r1_28) := sql.bind(X_2,"sys","functions","func",2);
@@ -112,12 +112,12 @@ function user.s3_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","functions");
- X_44 := algebra.ilikesubselect(X_6,X_3,A0,"":str,true);
+ X_45 := algebra.ilikesubselect(X_6,X_3,A0,"":str,true);
(X_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
- X_45 := algebra.ilikesubselect(r1_9,A0,"":str,true);
+ X_46 := algebra.ilikesubselect(r1_9,A0,"":str,true);
X_12 := sql.bind(X_2,"sys","functions","name",1);
- X_46 := algebra.ilikesubselect(X_12,X_3,A0,"":str,true);
- X_14 := sql.subdelta(X_44,X_9,X_45,X_46);
+ X_47 := algebra.ilikesubselect(X_12,X_3,A0,"":str,true);
+ X_14 := sql.subdelta(X_45,X_9,X_46,X_47);
X_16 := sql.projectdelta(X_14,X_6,X_9,r1_9,X_12);
X_17 := sql.bind(X_2,"sys","functions","func",0);
(X_19,r1_28) := sql.bind(X_2,"sys","functions","func",2);
@@ -158,14 +158,14 @@ function user.s4_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","functions");
- X_47 := calc.+("%":str,A0);
- X_48 := calc.+(X_47,"%":str);
- X_51 := algebra.likesubselect(X_6,X_3,X_48,"",false,false);
+ X_48 := calc.+("%":str,A0);
+ X_49 := calc.+(X_48,"%":str);
+ X_52 := algebra.likesubselect(X_6,X_3,X_49,"",false,false);
(X_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
- X_52 := algebra.likesubselect(r1_9,X_48,"",false,false);
+ X_53 := algebra.likesubselect(r1_9,X_49,"",false,false);
X_12 := sql.bind(X_2,"sys","functions","name",1);
- X_53 := algebra.likesubselect(X_12,X_3,X_48,"",false,false);
- X_14 := sql.subdelta(X_51,X_9,X_52,X_53);
+ X_54 := algebra.likesubselect(X_12,X_3,X_49,"",false,false);
+ X_14 := sql.subdelta(X_52,X_9,X_53,X_54);
X_15 := sql.projectdelta(X_14,X_6,X_9,r1_9,X_12);
X_16 := sql.bind(X_2,"sys","functions","func",0);
(X_18,r1_35) := sql.bind(X_2,"sys","functions","func",2);
@@ -186,14 +186,14 @@ function user.s5_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","functions");
- X_47 := calc.+("%":str,A0);
- X_48 := calc.+(X_47,"%":str);
- X_52 := algebra.likesubselect(X_6,X_3,X_48,"",false,true:bit);
+ X_48 := calc.+("%":str,A0);
+ X_49 := calc.+(X_48,"%":str);
+ X_53 := algebra.likesubselect(X_6,X_3,X_49,"",false,true:bit);
(X_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
- X_53 := algebra.likesubselect(r1_9,X_48,"",false,true:bit);
+ X_54 := algebra.likesubselect(r1_9,X_49,"",false,true:bit);
X_12 := sql.bind(X_2,"sys","functions","name",1);
- X_54 := algebra.likesubselect(X_12,X_3,X_48,"",false,true:bit);
- X_14 := sql.subdelta(X_52,X_9,X_53,X_54);
+ X_55 := algebra.likesubselect(X_12,X_3,X_49,"",false,true:bit);
+ X_14 := sql.subdelta(X_53,X_9,X_54,X_55);
X_15 := sql.projectdelta(X_14,X_6,X_9,r1_9,X_12);
X_16 := sql.bind(X_2,"sys","functions","func",0);
(X_18,r1_35) := sql.bind(X_2,"sys","functions","func",2);
@@ -214,14 +214,14 @@ function user.s6_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","functions");
- X_47 := calc.+("%":str,A0);
- X_48 := calc.+(X_47,"%":str);
- X_52 := algebra.likesubselect(X_6,X_3,X_48,"",true:bit,false);
+ X_48 := calc.+("%":str,A0);
+ X_49 := calc.+(X_48,"%":str);
+ X_53 := algebra.likesubselect(X_6,X_3,X_49,"",true:bit,false);
(X_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
- X_53 := algebra.likesubselect(r1_9,X_48,"",true:bit,false);
+ X_54 := algebra.likesubselect(r1_9,X_49,"",true:bit,false);
X_12 := sql.bind(X_2,"sys","functions","name",1);
- X_54 := algebra.likesubselect(X_12,X_3,X_48,"",true:bit,false);
- X_14 := sql.subdelta(X_52,X_9,X_53,X_54);
+ X_55 := algebra.likesubselect(X_12,X_3,X_49,"",true:bit,false);
+ X_14 := sql.subdelta(X_53,X_9,X_54,X_55);
X_15 := sql.projectdelta(X_14,X_6,X_9,r1_9,X_12);
X_16 := sql.bind(X_2,"sys","functions","func",0);
(X_18,r1_35) := sql.bind(X_2,"sys","functions","func",2);
@@ -242,14 +242,14 @@ function user.s7_1(A0:str):void;
X_2 := sql.mvc();
X_6 := sql.bind(X_2,"sys","functions","name",0);
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","functions");
- X_47 := calc.+("%":str,A0);
- X_48 := calc.+(X_47,"%":str);
- X_51 := algebra.likesubselect(X_6,X_3,X_48,"",true:bit,true:bit);
+ X_48 := calc.+("%":str,A0);
+ X_49 := calc.+(X_48,"%":str);
+ X_52 := algebra.likesubselect(X_6,X_3,X_49,"",true:bit,true:bit);
(X_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
- X_52 := algebra.likesubselect(r1_9,X_48,"",true:bit,true:bit);
+ X_53 := algebra.likesubselect(r1_9,X_49,"",true:bit,true:bit);
X_12 := sql.bind(X_2,"sys","functions","name",1);
- X_53 := algebra.likesubselect(X_12,X_3,X_48,"",true:bit,true:bit);
- X_14 := sql.subdelta(X_51,X_9,X_52,X_53);
+ X_54 := algebra.likesubselect(X_12,X_3,X_49,"",true:bit,true:bit);
+ X_14 := sql.subdelta(X_52,X_9,X_53,X_54);
X_15 := sql.projectdelta(X_14,X_6,X_9,r1_9,X_12);
X_16 := sql.bind(X_2,"sys","functions","func",0);
(X_18,r1_35) := sql.bind(X_2,"sys","functions","func",2);
diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
@@ -31,12 +31,12 @@ Operation successful
| X_2 := sql.mvc(); |
| X_9 := sql.bind(X_2,"sys","_tables","type",0); |
| X_6:bat[:oid,:oid] := sql.tid(X_2,"sys","_tables"); |
-| X_57 := algebra.subselect(X_9,X_6,2:sht,2:sht,true,true,true); |
+| X_58 := algebra.subselect(X_9,X_6,2:sht,2:sht,true,true,true); |
| (X_12,r1_12) := sql.bind(X_2,"sys","_tables","type",2); |
-| X_58 := algebra.subselect(r1_12,2:sht,2:sht,true,true,true); |
+| X_59 := algebra.subselect(r1_12,2:sht,2:sht,true,true,true); |
| X_15 := sql.bind(X_2,"sys","_tables","type",1); |
-| X_59 := algebra.subselect(X_15,X_6,2:sht,2:sht,true,true,true); |
-| X_17 := sql.subdelta(X_57,X_12,X_58,X_59); |
+| X_60 := algebra.subselect(X_15,X_6,2:sht,2:sht,true,true,true); |
+| X_17 := sql.subdelta(X_58,X_12,X_59,X_60); |
| X_18 := sql.bind(X_2,"sys","_tables","name",0); |
| (X_20,r1_28) := sql.bind(X_2,"sys","_tables","name",2); |
| X_22 := sql.bind(X_2,"sys","_tables","name",1); |
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -55,12 +55,12 @@ Operation successful
| X_2 := sql.mvc(); |
| X_9 := sql.bind(X_2,"sys","_tables","type",0); |
| X_6:bat[:oid,:oid] := sql.tid(X_2,"sys","_tables"); |
-| X_63 := algebra.subselect(X_9,X_6,2:sht,2:sht,true,true,true); |
+| X_64 := algebra.subselect(X_9,X_6,2:sht,2:sht,true,true,true); |
| (X_12,r1_12) := sql.bind(X_2,"sys","_tables","type",2); |
-| X_64 := algebra.subselect(r1_12,2:sht,2:sht,true,true,true); |
+| X_65 := algebra.subselect(r1_12,2:sht,2:sht,true,true,true); |
| X_15 := sql.bind(X_2,"sys","_tables","type",1); |
-| X_65 := algebra.subselect(X_15,X_6,2:sht,2:sht,true,true,true); |
-| X_17 := sql.subdelta(X_63,X_12,X_64,X_65); |
+| X_66 := algebra.subselect(X_15,X_6,2:sht,2:sht,true,true,true); |
+| X_17 := sql.subdelta(X_64,X_12,X_65,X_66); |
| X_18 := sql.bind(X_2,"sys","_tables","id",0); |
| (X_20,r1_28) := sql.bind(X_2,"sys","_tables","id",2); |
| X_22 := sql.bind(X_2,"sys","_tables","id",1); |
diff --git a/sql/test/Tests/setoptimizer.stable.out
b/sql/test/Tests/setoptimizer.stable.out
--- a/sql/test/Tests/setoptimizer.stable.out
+++ b/sql/test/Tests/setoptimizer.stable.out
@@ -67,8 +67,8 @@ Ready.
% 15, 447, 12 # length
[ "minimal_pipe",
"optimizer.inline();optimizer.remap();optimizer.deadcode();optimizer.multiplex();optimizer.garbageCollector();",
"stable" ]
[ "default_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();",
"stable" ]
-[ "no_mitosis_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();",
"stable" ]
-[ "sequential_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();",
"stable" ]
+[ "no_mitosis_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();",
"stable" ]
+[ "sequential_pipe",
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();",
"stable" ]
[ "user_1", " 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();", "experimental" ]
# 02:57:35 >
diff --git a/tools/mserver/mserver5.1 b/tools/mserver/mserver5.1
--- a/tools/mserver/mserver5.1
+++ b/tools/mserver/mserver5.1
@@ -225,19 +225,19 @@ minimal_pipe=inline,remap,deadcode,multi
The default pipe line contains as of Feb2010
mitosis-mergetable-reorder, aimed at large tables and improved
access locality.
-default_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+default_pipe=inline,remap,costModel,coercions,evaluate,emptySet,aliases,pushselect,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,matpack,dataflow,history,multiplex,garbageCollector
.IP "no_mitosis_pipe"
The no_mitosis pipe line is 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=inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+no_mitosis_pipe=inline,remap,costModel,coercions,evaluate,emptySet,aliases,pushselect,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,matpack,dataflow,history,multiplex,garbageCollector
.IP "sequential_pipe"
The sequential pipe line is 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=inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,history,multiplex,garbageCollector
+sequential_pipe=inline,remap,costModel,coercions,evaluate,emptySet,aliases,pushselect,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,matpack,history,multiplex,garbageCollector
.IP "nov2009_pipe"
The default pipeline used in the November 2009 release.
nov2009_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
