Changeset: ec92c79789e5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec92c79789e5
Modified Files:
monetdb5/optimizer/opt_pipes.c
sql/test/mosaic/Tests/compression.sql
sql/test/mosaic/Tests/compressionRLE.sql
sql/test/mosaic/Tests/compressionRLE.stable.out
sql/test/mosaic/Tests/compressionRLE2.sql
sql/test/mosaic/Tests/compressionRLE2.stable.out
sql/test/mosaic/Tests/prefix.stable.out
sql/test/mosaic/Tests/session_exit.sql
sql/test/mosaic/Tests/session_exit.stable.out
sql/test/mosaic/Tests/session_init.sql
sql/test/mosaic/Tests/session_init.stable.out
sql/test/mosaic/Tests/xqueries.sql
sql/test/mosaic/Tests/xqueries.stable.out
sql/test/mosaic/Tests/xqueries_delta.sql
sql/test/mosaic/Tests/xqueries_delta.stable.out
sql/test/mosaic/Tests/xqueries_rle.sql
sql/test/mosaic/Tests/xqueries_rle.stable.out
Branch: mosaic
Log Message:
The moasaic optimizer is put into a separate optimizer pipeline.
diffs (249 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
@@ -50,7 +50,7 @@ static struct PIPELINES {
"optimizer.deadcode();"
"optimizer.multiplex();"
"optimizer.generator();"
- "optimizer.mosaic();"
+// "optimizer.mosaic();"
"optimizer.profiler();"
"optimizer.candidates();"
"optimizer.garbageCollector();",
@@ -88,6 +88,41 @@ static struct PIPELINES {
"optimizer.querylog();"
"optimizer.multiplex();"
"optimizer.generator();"
+// "optimizer.mosaic();"
+ "optimizer.profiler();"
+ "optimizer.candidates();"
+ "optimizer.postfix();"
+ "optimizer.deadcode();"
+// "optimizer.jit();" awaiting the new batcalc api
+// "optimizer.oltp();"awaiting the autocommit front-end changes
+ "optimizer.wlc();"
+ "optimizer.garbageCollector();",
+ "stable", NULL, NULL, 1},
+/* The mosaic pipeline is the only pipeline that uses the mosaic optimizer.
+ * It is based on the sequential pipeline.
+*/
+ {"mosaic_pipe",
+ "optimizer.inline();"
+ "optimizer.remap();"
+ "optimizer.costModel();"
+ "optimizer.coercions();"
+ "optimizer.evaluate();"
+ "optimizer.emptybind();"
+ "optimizer.pushselect();"
+ "optimizer.aliases();"
+ "optimizer.mergetable();"
+ "optimizer.deadcode();"
+ "optimizer.aliases();"
+ "optimizer.constants();"
+ "optimizer.commonTerms();"
+ "optimizer.projectionpath();"
+ "optimizer.deadcode();"
+ "optimizer.reorder();"
+// "optimizer.reduce();" deprecated
+ "optimizer.matpack();"
+ "optimizer.querylog();"
+ "optimizer.multiplex();"
+ "optimizer.generator();"
"optimizer.mosaic();"
"optimizer.profiler();"
"optimizer.candidates();"
@@ -126,7 +161,7 @@ static struct PIPELINES {
"optimizer.multiplex();"
"optimizer.generator();"
"optimizer.volcano();"
- "optimizer.mosaic();"
+// "optimizer.mosaic();"
"optimizer.profiler();"
"optimizer.candidates();"
"optimizer.postfix();"
@@ -175,7 +210,7 @@ static struct PIPELINES {
"optimizer.deadcode();"
// "optimizer.jit();" awaiting the new batcalc api
// "optimizer.oltp();"awaiting the autocommit front-end changes
- "optimizer.mosaic();"
+// "optimizer.mosaic();"
"optimizer.wlc();"
"optimizer.garbageCollector();",
"stable", NULL, NULL, 1},
@@ -211,7 +246,7 @@ static struct PIPELINES {
"optimizer.querylog();"
"optimizer.multiplex();"
"optimizer.generator();"
- "optimizer.mosaic();"
+// "optimizer.mosaic();"
"optimizer.profiler();"
"optimizer.candidates();"
"optimizer.postfix();"
diff --git a/sql/test/mosaic/Tests/compression.sql
b/sql/test/mosaic/Tests/compression.sql
--- a/sql/test/mosaic/Tests/compression.sql
+++ b/sql/test/mosaic/Tests/compression.sql
@@ -1,4 +1,4 @@
-set optimizer='sequential_pipe';
+set optimizer='mosaic_pipe';
create table tmp3( i integer, b boolean, f real,t timestamp);
insert into tmp3 values
diff --git a/sql/test/mosaic/Tests/compressionRLE.sql
b/sql/test/mosaic/Tests/compressionRLE.sql
--- a/sql/test/mosaic/Tests/compressionRLE.sql
+++ b/sql/test/mosaic/Tests/compressionRLE.sql
@@ -1,4 +1,4 @@
-set optimizer='sequential_pipe';
+set optimizer='mosaic_pipe';
create table tmp3RLE( i integer, b boolean, f real,t timestamp);
insert into tmp3RLE values
diff --git a/sql/test/mosaic/Tests/compressionRLE.stable.out
b/sql/test/mosaic/Tests/compressionRLE.stable.out
--- a/sql/test/mosaic/Tests/compressionRLE.stable.out
+++ b/sql/test/mosaic/Tests/compressionRLE.stable.out
@@ -25,7 +25,7 @@ Ready.
# 21:09:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28373" "--port=30051"
# 21:09:37 >
-#set optimizer='sequential_pipe';
+#set optimizer='mosaic_pipe';
#drop table tmp3;
#create table tmp3( i integer, b boolean, f real,t timestamp);
#insert into tmp3 values
diff --git a/sql/test/mosaic/Tests/compressionRLE2.sql
b/sql/test/mosaic/Tests/compressionRLE2.sql
--- a/sql/test/mosaic/Tests/compressionRLE2.sql
+++ b/sql/test/mosaic/Tests/compressionRLE2.sql
@@ -1,4 +1,4 @@
-set optimizer='sequential_pipe';
+set optimizer='mosaic_pipe';
select * from tmp3RLE;
diff --git a/sql/test/mosaic/Tests/compressionRLE2.stable.out
b/sql/test/mosaic/Tests/compressionRLE2.stable.out
--- a/sql/test/mosaic/Tests/compressionRLE2.stable.out
+++ b/sql/test/mosaic/Tests/compressionRLE2.stable.out
@@ -29,7 +29,7 @@ Ready.
# 10:18:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10846" "--port=36017"
# 10:18:13 >
-#set optimizer='sequential_pipe';
+#set optimizer='mosaic_pipe';
#select * from tmp3RLE;
% sys.tmp3rle, sys.tmp3rle, sys.tmp3rle, sys.tmp3rle # table_name
% i, b, f, t # name
diff --git a/sql/test/mosaic/Tests/prefix.stable.out
b/sql/test/mosaic/Tests/prefix.stable.out
--- a/sql/test/mosaic/Tests/prefix.stable.out
+++ b/sql/test/mosaic/Tests/prefix.stable.out
@@ -23,7 +23,7 @@ Ready.
# 12:53:32 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-21664" "--port=35122"
# 12:53:32 >
-#set optimizer='sequential_pipe';
+#set optimizer='mosaic_pipe';
#create table tmpPrefix( i integer);
#insert into tmpPrefix values (1), (1), (1), (1), (1), (1), (2), (2);
[ 8 ]
diff --git a/sql/test/mosaic/Tests/session_exit.sql
b/sql/test/mosaic/Tests/session_exit.sql
--- a/sql/test/mosaic/Tests/session_exit.sql
+++ b/sql/test/mosaic/Tests/session_exit.sql
@@ -1,4 +1,4 @@
-set optimizer='sequential_pipe';
+set optimizer='mosaic_pipe';
explain select * from tmp3;
select * from tmp3;
diff --git a/sql/test/mosaic/Tests/session_exit.stable.out
b/sql/test/mosaic/Tests/session_exit.stable.out
--- a/sql/test/mosaic/Tests/session_exit.stable.out
+++ b/sql/test/mosaic/Tests/session_exit.stable.out
@@ -29,7 +29,7 @@ Ready.
# 16:53:28 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27036" "--port=39906"
# 16:53:28 >
-#set optimizer='sequential_pipe';
+#set optimizer='mosaic_pipe';
#explain select * from tmp3;
% .explain # table_name
% mal # name
diff --git a/sql/test/mosaic/Tests/session_init.sql
b/sql/test/mosaic/Tests/session_init.sql
--- a/sql/test/mosaic/Tests/session_init.sql
+++ b/sql/test/mosaic/Tests/session_init.sql
@@ -1,4 +1,4 @@
-set optimizer='sequential_pipe';
+set optimizer='mosaic_pipe';
create table tmp3( i integer, b boolean, f real,t timestamp);
insert into tmp3 values
diff --git a/sql/test/mosaic/Tests/session_init.stable.out
b/sql/test/mosaic/Tests/session_init.stable.out
--- a/sql/test/mosaic/Tests/session_init.stable.out
+++ b/sql/test/mosaic/Tests/session_init.stable.out
@@ -29,7 +29,7 @@ Ready.
# 16:53:27 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27036" "--port=39906"
# 16:53:27 >
-#set optimizer='sequential_pipe';
+#set optimizer='mosaic_pipe';
#create table tmp3( i integer, b boolean, f real,t timestamp);
#insert into tmp3 values
#(1, true, 0.314,'2014-08-23 11:34:54.000000'),
diff --git a/sql/test/mosaic/Tests/xqueries.sql
b/sql/test/mosaic/Tests/xqueries.sql
--- a/sql/test/mosaic/Tests/xqueries.sql
+++ b/sql/test/mosaic/Tests/xqueries.sql
@@ -1,4 +1,4 @@
-set optimizer='sequential_pipe';
+set optimizer='mosaic_pipe';
create table tmp3( i integer, b boolean, f real,t timestamp);
insert into tmp3 values
diff --git a/sql/test/mosaic/Tests/xqueries.stable.out
b/sql/test/mosaic/Tests/xqueries.stable.out
--- a/sql/test/mosaic/Tests/xqueries.stable.out
+++ b/sql/test/mosaic/Tests/xqueries.stable.out
@@ -25,7 +25,7 @@ Ready.
# 21:09:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28373" "--port=30051"
# 21:09:37 >
-#set optimizer='sequential_pipe';
+#set optimizer='mosaic_pipe';
#drop table tmp3;
#create table tmp3( i integer, b boolean, f real,t timestamp);
#insert into tmp3 values
diff --git a/sql/test/mosaic/Tests/xqueries_delta.sql
b/sql/test/mosaic/Tests/xqueries_delta.sql
--- a/sql/test/mosaic/Tests/xqueries_delta.sql
+++ b/sql/test/mosaic/Tests/xqueries_delta.sql
@@ -1,4 +1,4 @@
-set optimizer='sequential_pipe';
+set optimizer='mosaic_pipe';
create table dtmp3( i integer, b boolean, f real,t timestamp);
insert into dtmp3 values
diff --git a/sql/test/mosaic/Tests/xqueries_delta.stable.out
b/sql/test/mosaic/Tests/xqueries_delta.stable.out
--- a/sql/test/mosaic/Tests/xqueries_delta.stable.out
+++ b/sql/test/mosaic/Tests/xqueries_delta.stable.out
@@ -25,7 +25,7 @@ Ready.
# 21:39:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26302" "--port=38894"
# 21:39:36 >
-#set optimizer='sequential_pipe';
+#set optimizer='mosaic_pipe';
#drop table tmp3;
#create table tmp3( i integer, b boolean, f real,t timestamp);
#insert into tmp3 values
diff --git a/sql/test/mosaic/Tests/xqueries_rle.sql
b/sql/test/mosaic/Tests/xqueries_rle.sql
--- a/sql/test/mosaic/Tests/xqueries_rle.sql
+++ b/sql/test/mosaic/Tests/xqueries_rle.sql
@@ -1,4 +1,4 @@
-set optimizer='sequential_pipe';
+set optimizer='mosaic_pipe';
create table xtmp3( i integer, b boolean, f real,t timestamp);
insert into xtmp3 values
diff --git a/sql/test/mosaic/Tests/xqueries_rle.stable.out
b/sql/test/mosaic/Tests/xqueries_rle.stable.out
--- a/sql/test/mosaic/Tests/xqueries_rle.stable.out
+++ b/sql/test/mosaic/Tests/xqueries_rle.stable.out
@@ -25,7 +25,7 @@ Ready.
# 21:39:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26302" "--port=38894"
# 21:39:36 >
-#set optimizer='sequential_pipe';
+#set optimizer='mosaic_pipe';
#drop table tmp3;
#create table tmp3( i integer, b boolean, f real,t timestamp);
#insert into tmp3 values
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
