Changeset: 5b2eae8a1480 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b2eae8a1480 Modified Files: geom/BugTracker/Tests/X_crash.SF-1971632.sql geom/BugTracker/Tests/X_crash.SF-1971632.test monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql sql/backends/monet5/Tests/rapi18.sql sql/backends/monet5/UDF/udf/Tests/udf-fuse.sql sql/backends/monet5/UDF/udf/Tests/udf-fuse.test sql/backends/monet5/UDF/udf/Tests/udf-reverse.sql sql/backends/monet5/UDF/udf/Tests/udf-reverse.test sql/backends/monet5/generator/Tests/generator04.sql sql/backends/monet5/generator/Tests/generator04.test sql/benchmarks/ssbm/Tests/explain.SQL.py sql/benchmarks/tpch/Tests/explain.SQL.py sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.sql sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.test sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.sql sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.test sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.sql sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.test sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.sql sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.test sql/test/BugTracker-2013/Tests/between.Bug-3259.sql sql/test/BugTracker-2013/Tests/between.Bug-3259.test sql/test/BugTracker-2014/Tests/manifold.Bug-3556.sql sql/test/BugTracker-2014/Tests/manifold.Bug-3556.test sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.sql sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.test sql/test/BugTracker/Tests/explain.SF-1739353-data.sql sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356-data.sql sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.test sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.test sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.test sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.test sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.test sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.test sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.test sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.test sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.test sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.test sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.test sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.sql sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.test sql/test/Tests/trace.sql sql/test/Tests/trace.test sql/test/Users/Tests/sessioncontrol.sql sql/test/Users/Tests/sessioncontrol.test sql/test/pg_regress/Tests/box.sql sql/test/pg_regress/Tests/box.test sql/test/pg_regress/Tests/int8.sql sql/test/pg_regress/Tests/int8.test sql/test/pg_regress/Tests/numeric.sql sql/test/pg_regress/Tests/numeric.test Branch: mtest Log Message:
Let's be good testers and set the previous optimizer pipeline at the end of the test diffs (truncated from 637 to 300 lines): diff --git a/geom/BugTracker/Tests/X_crash.SF-1971632.sql b/geom/BugTracker/Tests/X_crash.SF-1971632.sql --- a/geom/BugTracker/Tests/X_crash.SF-1971632.sql +++ b/geom/BugTracker/Tests/X_crash.SF-1971632.sql @@ -10,3 +10,5 @@ select count(*) from geoms; select ST_X(g) from geoms order by id; DROP TABLE geoms; + +set optimizer = 'default_pipe'; diff --git a/geom/BugTracker/Tests/X_crash.SF-1971632.test b/geom/BugTracker/Tests/X_crash.SF-1971632.test --- a/geom/BugTracker/Tests/X_crash.SF-1971632.test +++ b/geom/BugTracker/Tests/X_crash.SF-1971632.test @@ -27,4 +27,5 @@ select ST_X(g) from geoms order by id statement ok DROP TABLE geoms - +statement ok +set optimizer = 'default_pipe' diff --git a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql --- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql +++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql @@ -23,3 +23,5 @@ explain copy into ttt from '/tmp/xyz'; explain copy into ttt from E'\\tmp/xyz'; explain copy into ttt from 'Z:/tmp/xyz'; drop table ttt; + +set optimizer = 'default_pipe'; diff --git a/sql/backends/monet5/Tests/rapi18.sql b/sql/backends/monet5/Tests/rapi18.sql --- a/sql/backends/monet5/Tests/rapi18.sql +++ b/sql/backends/monet5/Tests/rapi18.sql @@ -1,6 +1,5 @@ -- https://www.monetdb.org/pipermail/users-list/2015-October/008472.html -- used this to create test output ---set optimizer='sequential_pipe'; START TRANSACTION; diff --git a/sql/backends/monet5/UDF/udf/Tests/udf-fuse.sql b/sql/backends/monet5/UDF/udf/Tests/udf-fuse.sql --- a/sql/backends/monet5/UDF/udf/Tests/udf-fuse.sql +++ b/sql/backends/monet5/UDF/udf/Tests/udf-fuse.sql @@ -65,3 +65,5 @@ select fuse(e,f) from udf_fuse; drop procedure profiler.starttrace(); drop procedure profiler.stoptrace(); drop table udf_fuse; + +set optimizer = 'default_pipe'; diff --git a/sql/backends/monet5/UDF/udf/Tests/udf-fuse.test b/sql/backends/monet5/UDF/udf/Tests/udf-fuse.test --- a/sql/backends/monet5/UDF/udf/Tests/udf-fuse.test +++ b/sql/backends/monet5/UDF/udf/Tests/udf-fuse.test @@ -247,4 +247,5 @@ drop procedure profiler.stoptrace() statement ok drop table udf_fuse - +statement ok +set optimizer = 'default_pipe' diff --git a/sql/backends/monet5/UDF/udf/Tests/udf-reverse.sql b/sql/backends/monet5/UDF/udf/Tests/udf-reverse.sql --- a/sql/backends/monet5/UDF/udf/Tests/udf-reverse.sql +++ b/sql/backends/monet5/UDF/udf/Tests/udf-reverse.sql @@ -34,3 +34,5 @@ drop procedure profiler.starttrace(); drop procedure profiler.stoptrace(); drop table udf_reverse; + +set optimizer = 'default_pipe'; diff --git a/sql/backends/monet5/UDF/udf/Tests/udf-reverse.test b/sql/backends/monet5/UDF/udf/Tests/udf-reverse.test --- a/sql/backends/monet5/UDF/udf/Tests/udf-reverse.test +++ b/sql/backends/monet5/UDF/udf/Tests/udf-reverse.test @@ -106,4 +106,5 @@ drop procedure profiler.stoptrace() statement ok drop table udf_reverse - +statement ok +set optimizer = 'default_pipe' diff --git a/sql/backends/monet5/generator/Tests/generator04.sql b/sql/backends/monet5/generator/Tests/generator04.sql --- a/sql/backends/monet5/generator/Tests/generator04.sql +++ b/sql/backends/monet5/generator/Tests/generator04.sql @@ -12,3 +12,5 @@ select * from generate_series(null,10,1) select * from generate_series( timestamp '2008-03-01 00:00', timestamp '2008-03-04 12:00'); + +set optimizer = 'default_pipe'; diff --git a/sql/backends/monet5/generator/Tests/generator04.test b/sql/backends/monet5/generator/Tests/generator04.test --- a/sql/backends/monet5/generator/Tests/generator04.test +++ b/sql/backends/monet5/generator/Tests/generator04.test @@ -21,4 +21,5 @@ select * from generate_series( timestamp '2008-03-01 00:00', timestamp '2008-03-04 12:00') - +statement ok +set optimizer = 'default_pipe' diff --git a/sql/benchmarks/ssbm/Tests/explain.SQL.py b/sql/benchmarks/ssbm/Tests/explain.SQL.py --- a/sql/benchmarks/ssbm/Tests/explain.SQL.py +++ b/sql/benchmarks/ssbm/Tests/explain.SQL.py @@ -11,6 +11,7 @@ with process.client('sql', stdin=process c.stdin.write('explain\n') for ln in open(os.path.join(TSTSRCDIR,"%s.sql" % os.environ['TST'][0:2])): c.stdin.write(ln) + c.stdin.write("set optimizer = 'default_pipe';\n") out, err = c.communicate() sys.stdout.write(out) sys.stderr.write(err) diff --git a/sql/benchmarks/tpch/Tests/explain.SQL.py b/sql/benchmarks/tpch/Tests/explain.SQL.py --- a/sql/benchmarks/tpch/Tests/explain.SQL.py +++ b/sql/benchmarks/tpch/Tests/explain.SQL.py @@ -17,6 +17,7 @@ with process.client('sql', stdin=process c.stdin.write('explain select\n') elif not stats.match(ln): c.stdin.write(ln) + c.stdin.write("set optimizer = 'default_pipe';\n") out, err = c.communicate() sys.stdout.write(out) sys.stderr.write(err) diff --git a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.sql b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.sql --- a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.sql +++ b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.sql @@ -10,3 +10,4 @@ alter table blabla drop constraint dada; select '~BeginProfilingOutput~'; explain alter table blabla add constraint dada unique (id); select '~EndProfilingOutput~'; +set optimizer='default_pipe'; diff --git a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.test b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.test --- a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.test +++ b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.test @@ -42,4 +42,6 @@ select '~EndProfilingOutput~' ---- ~EndProfilingOutput~ +statement ok +set optimizer = 'default_pipe' diff --git a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.sql b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.sql --- a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.sql +++ b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.sql @@ -8,3 +8,4 @@ select * from t2564; --explain select count(*) from t2564 group by c1, c2, c3; select count(*) from t2564 group by c1, c2, c3; drop table t2564; +set optimizer='default_pipe'; diff --git a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.test b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.test --- a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.test +++ b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.test @@ -36,4 +36,6 @@ 1 statement ok drop table t2564 +statement ok +set optimizer = 'default_pipe' diff --git a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.sql b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.sql --- a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.sql +++ b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.sql @@ -7,3 +7,4 @@ create function func_2826(f real) return select * from tab_2826 where func_2826(d) > 1; drop function func_2826; drop table tab_2826; +set optimizer='default_pipe'; diff --git a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.test b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.test --- a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.test +++ b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.test @@ -20,4 +20,6 @@ drop function func_2826 statement ok drop table tab_2826 +statement ok +set optimizer = 'default_pipe' diff --git a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.sql b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.sql --- a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.sql +++ b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.sql @@ -39,3 +39,5 @@ explain select name,func from functions explain select name,func from functions where not_icontains(name, 'optimizers'); rollback; + +set optimizer='default_pipe'; diff --git a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.test b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.test --- a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.test +++ b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.test @@ -75,4 +75,6 @@ 48 values hashing to 36c0131cc3e60aabd18 statement ok rollback +statement ok +set optimizer = 'default_pipe' diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.sql b/sql/test/BugTracker-2013/Tests/between.Bug-3259.sql --- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.sql +++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.sql @@ -25,3 +25,5 @@ SELECT t1.subject as id1, t2.subject as FROM treeitems t1, treeitems t2 WHERE t2.pre between t1.pre and t1.pre + t1.size; ROLLBACK; + +set optimizer = 'default_pipe'; diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.test b/sql/test/BugTracker-2013/Tests/between.Bug-3259.test --- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.test +++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.test @@ -31,4 +31,6 @@ 1 statement ok ROLLBACK +statement ok +set optimizer = 'default_pipe' diff --git a/sql/test/BugTracker-2014/Tests/manifold.Bug-3556.sql b/sql/test/BugTracker-2014/Tests/manifold.Bug-3556.sql --- a/sql/test/BugTracker-2014/Tests/manifold.Bug-3556.sql +++ b/sql/test/BugTracker-2014/Tests/manifold.Bug-3556.sql @@ -38,3 +38,5 @@ select count(*) from sys.tracelog() wher drop procedure profiler.starttrace(); drop procedure profiler.stoptrace(); + +set optimizer = 'default_pipe'; diff --git a/sql/test/BugTracker-2014/Tests/manifold.Bug-3556.test b/sql/test/BugTracker-2014/Tests/manifold.Bug-3556.test --- a/sql/test/BugTracker-2014/Tests/manifold.Bug-3556.test +++ b/sql/test/BugTracker-2014/Tests/manifold.Bug-3556.test @@ -116,4 +116,6 @@ drop procedure profiler.starttrace() statement ok drop procedure profiler.stoptrace() +statement ok +set optimizer = 'default_pipe' diff --git a/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.sql b/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.sql --- a/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.sql +++ b/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.sql @@ -1840,3 +1840,4 @@ SELECT v, cast(v as timestamp with time DROP TABLE T_timestamptz; +set optimizer = 'default_pipe'; diff --git a/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.test b/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.test --- a/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.test +++ b/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.test @@ -5923,4 +5923,7 @@ 10 values hashing to bb7961ac5b429a46b76 statement ok DROP TABLE T_timestamptz - +statement ok +set optimizer = 'default_pipe' + + diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353-data.sql b/sql/test/BugTracker/Tests/explain.SF-1739353-data.sql --- a/sql/test/BugTracker/Tests/explain.SF-1739353-data.sql +++ b/sql/test/BugTracker/Tests/explain.SF-1739353-data.sql @@ -1,3 +1,4 @@ -- disable parallelism (mitosis & dataflow) to avoid ambiguous results set optimizer='sequential_pipe'; EXPLAIN SELECT "name" FROM "tables"; +set optimizer='default_pipe'; 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 @@ -84,6 +84,7 @@ Operation successful | #total actions=27 time=226 usec | +-------------------------------------------------------------------------------------------------------------------------+ 54 rows +Operation successful # 17:52:43 > # 17:52:43 > "Done." diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356-data.sql b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356-data.sql --- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356-data.sql +++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356-data.sql @@ -3,3 +3,4 @@ plan select count(*) from tables; -- disable parallelism (mitosis & dataflow) to avoid ambiguous results set optimizer='sequential_pipe'; explain select count(*) from tables; +set optimizer='default_pipe'; 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 @@ -104,6 +104,7 @@ Operation successful | #total actions=27 time=175 usec | +--------------------------------------------------------------------------------------------------------------------+ 47 rows +Operation successful # 12:56:37 > # 12:56:37 > "Done." diff --git a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.sql b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.sql --- a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.sql +++ b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.sql @@ -3,3 +3,5 @@ set optimizer = 'sequential_pipe'; explain select count(*) from fk; explain select id from fk order by id; + +set optimizer = 'default_pipe'; diff --git a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.test b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.test --- a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.test +++ b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.test @@ -11,4 +11,7 @@ explain select id from fk order by ---- _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
