Changeset: b69677dbd203 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b69677dbd203 Modified Files: sql/backends/monet5/Tests/optimizers.sql sql/backends/monet5/Tests/optimizers.stable.err sql/backends/monet5/Tests/optimizers.stable.out sql/test/BugTracker-2009/Tests/reorder.SF-2770608.sql sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.sql Branch: default Log Message:
make existing tests use new "set optimizer = ..." conventions diffs (258 lines): diff --git a/sql/backends/monet5/Tests/optimizers.sql b/sql/backends/monet5/Tests/optimizers.sql --- a/sql/backends/monet5/Tests/optimizers.sql +++ b/sql/backends/monet5/Tests/optimizers.sql @@ -13,30 +13,30 @@ select 'optimizer on test:',optimizer; set optimizer=''; select 'optimizer <empty> test:',optimizer; -set optimizer='costModel,coercions,emptySet,accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector'; +set optimizer='optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.accessmode();optimizer.aliases();optimizer.commonTerms();optimizer.accumulators();optimizer.joinPath();optimizer.deadcode();optimizer.reduce();optimizer.garbageCollector();'; -set optimizer='coercions,emptySet,accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector'; +set optimizer='optimizer.coercions();optimizer.emptySet();optimizer.accessmode();optimizer.aliases();optimizer.commonTerms();optimizer.accumulators();optimizer.joinPath();optimizer.deadcode();optimizer.reduce();optimizer.garbageCollector();'; -set optimizer='emptySet,accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector'; +set optimizer='optimizer.emptySet();optimizer.accessmode();optimizer.aliases();optimizer.commonTerms();optimizer.accumulators();optimizer.joinPath();optimizer.deadcode();optimizer.reduce();optimizer.garbageCollector();'; -set optimizer='accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector'; +set optimizer='optimizer.accessmode();optimizer.aliases();optimizer.commonTerms();optimizer.accumulators();optimizer.joinPath();optimizer.deadcode();optimizer.reduce();optimizer.garbageCollector();'; -set optimizer='aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector'; +set optimizer='optimizer.aliases();optimizer.commonTerms();optimizer.accumulators();optimizer.joinPath();optimizer.deadcode();optimizer.reduce();optimizer.garbageCollector();'; -set optimizer='commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector'; +set optimizer='optimizer.commonTerms();optimizer.accumulators();optimizer.joinPath();optimizer.deadcode();optimizer.reduce();optimizer.garbageCollector();'; -set optimizer='accumulators,joinPath,deadcode,reduce,garbageCollector'; +set optimizer='optimizer.accumulators();optimizer.joinPath();optimizer.deadcode();optimizer.reduce();optimizer.garbageCollector();'; -set optimizer='joinPath,deadcode,reduce,garbageCollector'; +set optimizer='optimizer.joinPath();optimizer.deadcode();optimizer.reduce();optimizer.garbageCollector();'; -set optimizer='deadcode,reduce,garbageCollector'; +set optimizer='optimizer.deadcode();optimizer.reduce();optimizer.garbageCollector();'; -set optimizer='reduce,garbageCollector'; +set optimizer='optimizer.reduce();optimizer.garbageCollector();'; -set optimizer='garbageCollector'; +set optimizer='optimizer.garbageCollector();'; -set optimizer='costModel,coercions,emptySet,accessmode,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector'; +set optimizer='optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.accessmode();optimizer.commonTerms();optimizer.accumulators();optimizer.joinPath();optimizer.deadcode();optimizer.reduce();optimizer.garbageCollector();'; -set optimizer='costModel,coercions,emptySet,accessmode,commonTerms,accumulators,joinPath,deadcode,garbageCollector'; +set optimizer='optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.accessmode();optimizer.commonTerms();optimizer.accumulators();optimizer.joinPath();optimizer.deadcode();optimizer.garbageCollector();'; select 'done'; diff --git a/sql/backends/monet5/Tests/optimizers.stable.err b/sql/backends/monet5/Tests/optimizers.stable.err --- a/sql/backends/monet5/Tests/optimizers.stable.err +++ b/sql/backends/monet5/Tests/optimizers.stable.err @@ -1,20 +1,44 @@ stderr of test 'optimizers` in directory 'backends/monet5` itself: -# 08:05:50 > -# 08:05:50 > Mtimeout -timeout 180 mserver5 "--config=/ufs/mk/monet5stable/Linux/etc/monetdb5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5stable//Linux/lib/MonetDB5:/ufs/mk/monet5stable//Linux/lib/MonetDB5/lib:/ufs/mk/monet5stable//Linux/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/mk/monet5stable//dbfarm" --set "sql_logdir=/ufs/mk/monet5stable//dblogs/logs/sql" --set "xquery_logdir=/ufs/mk/monet5stable//Linux/var/MonetDB5/xquery_logs" --set mapi_open=true --set mapi_port=35043 --set xrpc_port=43626 --set monet_prompt= --trace "--dbname=mTests_src_backends_monet5" --dbinit=' include sql;' ; echo ; echo Over.. -# 08:05:50 > +# 03:16:16 > +# 03:16:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/ufs/manegold/_/Monet/HG/default/prefix/--disable-assert_--disable-debug_--enable-optimize/var/MonetDB" "--set" "mapi_open=true" "--set" "mapi_port=36613" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_backends_monet5" "--set" "mal_listing=0" +# 03:16:16 > -#warning: please don't forget to set your vault key! -#(see /ufs/mk/monet5stable/Linux/etc/monetdb5.conf) +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = /ufs/manegold/_/Monet/HG/default/prefix/--disable-assert_--disable-debug_--enable-optimize/var/monetdb5/dbfarm +# builtin opt gdk_debug = 0 +# builtin opt gdk_alloc_map = no +# builtin opt gdk_vmtrim = yes +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt gdk_dbfarm = /ufs/manegold/_/Monet/HG/default/prefix/--disable-assert_--disable-debug_--enable-optimize/var/MonetDB +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 36613 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_backends_monet5 +# cmdline opt mal_listing = 0 -# 08:05:50 > -# 08:05:50 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb --host=gio --port=35043 -# 08:05:50 > +# 03:16:16 > +# 03:16:16 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome" "--port=36613" +# 03:16:16 > -MAPI = monetdb@sofia:38256 +MAPI = monetdb@rome:32064 +QUERY = set optimizer='off'; +ERROR = !Syntax error detected.See documentation for details +MAPI = monetdb@rome:32064 +QUERY = set optimizer='on'; +ERROR = !Syntax error detected.See documentation for details +MAPI = monetdb@rome:32064 QUERY = set optimizer=''; -ERROR = !SQLException:optimizer:Optimizer '' pipeline does not exist, use default pipe instead +ERROR = !Syntax error detected.See documentation for details MAPI = monetdb@sofia:38256 QUERY = set optimizer='costModel,coercions,emptySet,accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector'; ERROR = !SET OPTIMIZER: 'inline' should be the first @@ -55,7 +79,7 @@ MAPI = monetdb@sofia:38256 QUERY = set optimizer='costModel,coercions,emptySet,accessmode,commonTerms,accumulators,joinPath,deadcode,garbageCollector'; ERROR = !SET OPTIMIZER: 'inline' should be the first -# 08:05:51 > -# 08:05:51 > Done. -# 08:05:51 > +# 03:16:17 > +# 03:16:17 > "Done." +# 03:16:17 > diff --git a/sql/backends/monet5/Tests/optimizers.stable.out b/sql/backends/monet5/Tests/optimizers.stable.out --- a/sql/backends/monet5/Tests/optimizers.stable.out +++ b/sql/backends/monet5/Tests/optimizers.stable.out @@ -1,61 +1,67 @@ stdout of test 'optimizers` in directory 'backends/monet5` itself: -# 19:20:09 > -# 19:20:09 > mserver5 "--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=4 --set "monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs" --set mapi_open=true --set xrpc_open=true --set mapi_port=33064 --set xrpc_port=41264 --set monet_prompt= --trace "--dbname=mTests_src_backends_monet5" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. -# 19:20:09 > +# 03:16:16 > +# 03:16:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/ufs/manegold/_/Monet/HG/default/prefix/--disable-assert_--disable-debug_--enable-optimize/var/MonetDB" "--set" "mapi_open=true" "--set" "mapi_port=36613" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_backends_monet5" "--set" "mal_listing=0" +# 03:16:16 > -# MonetDB server v5.9.0, based on kernel v1.27.0 -# Serving database 'mTests_src_backends_monet5', using 4 threads +# MonetDB 5 server v11.8.0 +# This is an unreleased version +# Serving database 'mTests_backends_monet5', using 8 threads # Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 15.630 GiB available main-memory. # Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008- MonetDB B.V., all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:33064/ -# MonetDB/SQL module v2.27.0 loaded +# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://rome.ins.cwi.nl:36613/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded Ready. -# falling back to direct mode -# falling back to direct mode -# falling back to direct mode -# falling back to direct mode -# falling back to direct mode -# falling back to direct mode -# falling back to direct mode -# falling back to direct mode -# falling back to direct mode -# falling back to direct mode -# falling back to direct mode -# falling back to direct mode -# falling back to direct mode -# falling back to direct mode -# falling back to direct mode -#function user.main():void; -# clients.quit(); -#end main; +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# loading sql script: 10_math.sql +# loading sql script: 11_times.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_history.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_compress.sql +# loading sql script: 18_dictionary.sql +# loading sql script: 19_cluster.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_functions.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 24_zorder.sql +# loading sql script: 25_debug.sql +# loading sql script: 40_geom.sql +# loading sql script: 80_udf.sql +# loading sql script: 99_system.sql +# 03:16:16 > +# 03:16:16 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome" "--port=36613" +# 03:16:16 > -# 19:20:09 > -# 19:20:09 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=33064 -# 19:20:09 > - +#select 'optimizer test:',optimizer; % ., . # table_name % single_value, single_value # name % char, varchar # type -% 15, 188 # length -[ "optimizer test:", "inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,accumulators,garbageCollector" ] +% 15, 12 # length +[ "optimizer test:", "default_pipe" ] #select 'optimizer off test:',optimizer; % ., . # table_name % single_value, single_value # name % char, varchar # type -% 19, 3 # length -[ "optimizer off test:", "off" ] +% 19, 12 # length +[ "optimizer off test:", "default_pipe" ] #select 'optimizer on test:',optimizer; % ., . # table_name % single_value, single_value # name % char, varchar # type -% 18, 2 # length -[ "optimizer on test:", "on" ] +% 18, 12 # length +[ "optimizer on test:", "default_pipe" ] #select 'optimizer <empty> test:',optimizer; % ., . # table_name % single_value, single_value # name @@ -69,7 +75,7 @@ Ready. % 4 # length [ "done" ] -# 19:20:09 > -# 19:20:09 > Done. -# 19:20:09 > +# 03:16:17 > +# 03:16:17 > "Done." +# 03:16:17 > diff --git a/sql/test/BugTracker-2009/Tests/reorder.SF-2770608.sql b/sql/test/BugTracker-2009/Tests/reorder.SF-2770608.sql --- a/sql/test/BugTracker-2009/Tests/reorder.SF-2770608.sql +++ b/sql/test/BugTracker-2009/Tests/reorder.SF-2770608.sql @@ -42,7 +42,7 @@ 5125 "url" "url" 0 0 0 13 2000 5187 "inet" "inet" 0 0 0 13 2000 -- query causes problems in specific pipeline -set optimizer='inline,remap,evaluate,costModel,coercions,emptySet,mitosis,aliases,mergetable,deadcode,constants,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector'; +set optimizer='optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.mitosis();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();'; select * from t2770608 t1, t2770608 t2 where t1.id = t2.id; -- clean up diff --git a/sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.sql b/sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.sql --- a/sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.sql +++ b/sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.sql @@ -1,6 +1,6 @@ start transaction; -set optimizer='inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,reorder,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector'; +set optimizer='optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.constants();optimizer.commonTerms();optimizer.reorder();optimizer.joinPath();optimizer.deadcode();optimizer.recycle();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();'; CREATE TABLE y (x int); INSERT INTO y VALUES (10); _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
