Changeset: a316317c2c51 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a316317c2c51 Modified Files: monetdb5/optimizer/Tests/dataflow3.stable.out.single monetdb5/tools/Tests/mserver5--help.stable.err.Windows Branch: default Log Message:
Merge with Dec2011 branch. diffs (truncated from 615 to 300 lines): diff --git a/monetdb5/optimizer/Tests/dataflow3.stable.out.single b/monetdb5/optimizer/Tests/dataflow3.stable.out.single deleted file mode 100644 --- a/monetdb5/optimizer/Tests/dataflow3.stable.out.single +++ /dev/null @@ -1,120 +0,0 @@ -stdout of test 'dataflow3` in directory 'optimizer` itself: - - -# 15:05:21 > -# 15:05:21 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/ufs/mk/Aug2011//Linux/var/MonetDB" --set mapi_open=true --set mapi_port=32629 --set monet_prompt= --trace --forcemito --set mal_listing=2 --dbname=mTests_optimizer dataflow3.mal -# 15:05:21 > - -# MonetDB 5 server v11.5.0 -# This is an unreleased version -# Serving database 'mTests_optimizer', using 4 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Found 7.749 GiB available main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32629/ -# MonetDB/GIS module loaded -# MonetDB/SQL module loaded -function user.mvc():int; - return mvc := 1; -end mvc; -function user.s1_0{autoCommit=true}():void; - X2 := user.mvc(); -#distributing work over columns selected for mapreduce - X17 := bat.new(nil:oid,nil:wrd); - X54 := bat.new(nil:oid,nil:wrd); - X55 := bat.new(nil:oid,nil:wrd); - X56 := bat.new(nil:oid,nil:wrd); - X57 := bat.new(nil:oid,nil:wrd); -#barrier _58 := language.dataflow(); - X59 := remote.connect("mapi:monetdb://volund.ins.cwi.nl:50000/sn4","monetdb","monetdb","msql"); - remote.register(X59,"user","s1_0map"); - X66 := remote.put(X59,X54); - X66 := remote.exec(X59,"user","s1_0map"); - X54 := remote.get(X59,X66); - remote.disconnect(X59); -#exit _58; -#barrier _69 := language.dataflow(); - X70 := remote.connect("mapi:monetdb://volund.ins.cwi.nl:50000/sn3","monetdb","monetdb","msql"); - remote.register(X70,"user","s1_0map"); - X73 := remote.put(X70,X55); - X73 := remote.exec(X70,"user","s1_0map"); - X55 := remote.get(X70,X73); - remote.disconnect(X70); -#exit _69; -#barrier _76 := language.dataflow(); - X77 := remote.connect("mapi:monetdb://volund.ins.cwi.nl:50000/sn1","monetdb","monetdb","msql"); - remote.register(X77,"user","s1_0map"); - X80 := remote.put(X77,X56); - X80 := remote.exec(X77,"user","s1_0map"); - X56 := remote.get(X77,X80); - remote.disconnect(X77); -#exit _76; -#barrier _83 := language.dataflow(); - X84 := remote.connect("mapi:monetdb://volund.ins.cwi.nl:50000/sn2","monetdb","monetdb","msql"); - remote.register(X84,"user","s1_0map"); - X87 := remote.put(X84,X57); - X87 := remote.exec(X84,"user","s1_0map"); - X57 := remote.get(X84,X87); - remote.disconnect(X84); -#exit _83; - bat.insert(X17,X54); - bat.insert(X17,X55); - bat.insert(X17,X56); - bat.insert(X17,X57); - io.print(X17); - X17 := algebra.markH(X17); -#end distribution, optimisations may follow -#COUNT/SUM - X19 := aggr.sum(X17); - io.print(X19); -end s1_0; -function user.main():void; -#map reduce development test. - mdb.list("user","s1_0"); -end main; -function user.s1_0{autoCommit=true}():void; - X17 := bat.new(nil:oid,nil:wrd); - X54 := bat.new(nil:oid,nil:wrd); - X55 := bat.new(nil:oid,nil:wrd); - X56 := bat.new(nil:oid,nil:wrd); - X57 := bat.new(nil:oid,nil:wrd); - X59 := remote.connect("mapi:monetdb://volund.ins.cwi.nl:50000/sn4","monetdb","monetdb","msql"); - remote.register(X59,"user","s1_0map"); - X66 := remote.put(X59,X54); - X66 := remote.exec(X59,"user","s1_0map"); - X54 := remote.get(X59,X66); - remote.disconnect(X59); - X70 := remote.connect("mapi:monetdb://volund.ins.cwi.nl:50000/sn3","monetdb","monetdb","msql"); - remote.register(X70,"user","s1_0map"); - X73 := remote.put(X70,X55); - X73 := remote.exec(X70,"user","s1_0map"); - X55 := remote.get(X70,X73); - remote.disconnect(X70); - X77 := remote.connect("mapi:monetdb://volund.ins.cwi.nl:50000/sn1","monetdb","monetdb","msql"); - remote.register(X77,"user","s1_0map"); - X80 := remote.put(X77,X56); - X80 := remote.exec(X77,"user","s1_0map"); - X56 := remote.get(X77,X80); - remote.disconnect(X77); - X84 := remote.connect("mapi:monetdb://volund.ins.cwi.nl:50000/sn2","monetdb","monetdb","msql"); - remote.register(X84,"user","s1_0map"); - X87 := remote.put(X84,X57); - X87 := remote.exec(X84,"user","s1_0map"); - X57 := remote.get(X84,X87); - remote.disconnect(X84); - bat.insert(X17,X54); - bat.insert(X17,X55); - bat.insert(X17,X56); - bat.insert(X17,X57); - io.print(X17); - X17 := algebra.markH(X17); - X19 := aggr.sum(X17); - io.print(X19); -end s1_0; - -# 15:05:21 > -# 15:05:21 > Done. -# 15:05:21 > - diff --git a/monetdb5/tools/Tests/mserver5--help.stable.err.Windows b/monetdb5/tools/Tests/mserver5--help.stable.err.Windows deleted file mode 100644 --- a/monetdb5/tools/Tests/mserver5--help.stable.err.Windows +++ /dev/null @@ -1,41 +0,0 @@ -stderr of test 'mserver5--help` in directory 'tools` itself: - - -# 16:36:12 > -# 16:36:12 > Mtimeout -timeout 300 ./mserver5--help mserver5--help -# 16:36:12 > - - -# 16:36:12 > -# 16:36:12 > Mtimeout -timeout 60 mserver5 --config= --help -# 16:36:12 > - -Usage: mserver5 [options] [scripts] - --dbname=<database_name> Specify database name - --dbfarm=<directory> Specify database location - --dbinit=<stmt> Execute statement at startup - --config=<config_file> Use config_file to read options from - --daemon=yes|no Do not read commands from standard input [no] - --single-user Allow only one user at a time - --readonly Safeguard database - --set <option>=<value> Set configuration option - --help Print this list of options - --version Print version and compile time info -The debug, testing & trace options: - --threads - --memory - --properties - --io - --transactions - --modules - --algorithms - --xproperties - --performance - --optimizers - --forcemito - --debug=<bitmask> - -# 10:03:11 > -# 10:03:11 > Done. -# 10:03:11 > - diff --git a/sql/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err.Darwin b/sql/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err.Darwin --- a/sql/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err.Darwin +++ b/sql/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err.Darwin @@ -71,13 +71,13 @@ stderr of test 'connectto.Bug-2548` in d # 13:12:55 > mclient -lsql -ftest -i -e --host=rig --port=39884 # 13:12:55 > -MAPI = monetdb@alf:34263 +MAPI = monetdb@sofia:38256 QUERY = connect to default; ERROR = !CONNECT TO: DEFAULT is not supported! -MAPI = monetdb@alf:34263 +MAPI = monetdb@sofia:38256 QUERY = connect to 'whatever' port 50001 database 'nonexisting' USER 'monetdb' PASSWORD 'monetdb' LANGUAGE 'mal'; ERROR = !IOException:mapi.connect:Could not connect: getaddrinfo failed: nodename nor servname provided, or not known -MAPI = monetdb@alf:34263 +MAPI = monetdb@sofia:38256 QUERY = disconnect 'whatever'; ERROR = !DISCONNECT CATALOG: no such db_alias 'whatever' diff --git a/sql/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err.FreeBSD b/sql/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err.FreeBSD new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err.FreeBSD @@ -0,0 +1,87 @@ +stderr of test 'connectto.Bug-2548` in directory 'test/BugTracker-2010` itself: + + +# 13:12:55 > +# 13:12:55 > mserver5 "--config=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=0 --set "monet_mod_path=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5/bin" --set "gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./var/MonetDB5/dbfarm" --set mapi_open=true --set xrpc_open=true --set mapi_port=39884 --set xrpc_port=41478 --set monet_prompt= --set mal_listing=2 --trace "--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo Over.. +# 13:12:55 > + +# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu +# builtin opt gdk_version = 1.38.1 +# builtin opt prefix = /ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix. +# builtin opt exec_prefix = ${prefix} +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm +# builtin opt gdk_debug = 0 +# builtin opt gdk_alloc_map = no +# builtin opt gdk_vmtrim = yes +# builtin opt monet_admin = adm +# builtin opt monet_prompt = > +# builtin opt monet_welcome = yes +# builtin opt monet_mod_path = ${exec_prefix}/lib64/MonetDB +# builtin opt monet_daemon = no +# builtin opt host = localhost +# builtin opt mapi_port = 50000 +# builtin opt mapi_clients = 2 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_debug = 0 +# builtin opt standoff_ns = +# builtin opt standoff_start = start +# builtin opt standoff_end = end +# config opt prefix = /ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix. +# config opt config = ${prefix}/etc/monetdb5.conf +# config opt prefix = /ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix. +# config opt exec_prefix = ${prefix} +# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm +# config opt monet_mod_path = ${exec_prefix}/lib64/MonetDB5:${exec_prefix}/lib64/MonetDB5/lib:${exec_prefix}/lib64/MonetDB5/bin +# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid +# config opt mero_controlport = 50001 +# config opt sql_optimizer = default_pipe +# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector +# config opt default_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt nov2009_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt replication_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector +# config opt accumulator_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector +# config opt recycler_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector +# config opt cracker_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt sidcrack_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt datacell_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt octopus_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt mapreduce_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt datacyclotron_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,constants,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector +# config opt derive_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,derivePath,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt dictionary_pipe = inline,remap,dictionary,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector +# config opt compression_pipe = inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,compression,dataflow,history,multiplex,garbageCollector +# cmdline opt config = /ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./etc/monetdb5.conf +# cmdline opt gdk_nr_threads = 0 +# cmdline opt monet_mod_path = /ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5/bin +# cmdline opt gdk_dbfarm = /ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./var/MonetDB5/dbfarm +# cmdline opt mapi_open = true +# cmdline opt xrpc_open = true +# cmdline opt mapi_port = 39884 +# cmdline opt xrpc_port = 41478 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2010 +# cmdline opt mal_listing = 0 +#warning: please don't forget to set your vault key! +#(see /ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./etc/monetdb5.conf) + +# 13:12:55 > +# 13:12:55 > mclient -lsql -ftest -i -e --host=rig --port=39884 +# 13:12:55 > + +MAPI = monetdb@sofia:38256 +QUERY = connect to default; +ERROR = !CONNECT TO: DEFAULT is not supported! +MAPI = monetdb@sofia:38256 +QUERY = connect to 'whatever' port 50001 database 'nonexisting' USER 'monetdb' PASSWORD 'monetdb' LANGUAGE 'mal'; +ERROR = !IOException:mapi.connect:Could not connect: getaddrinfo failed: hostname nor servname provided, or not known +MAPI = monetdb@sofia:38256 +QUERY = disconnect 'whatever'; +ERROR = !DISCONNECT CATALOG: no such db_alias 'whatever' + +# 13:12:55 > +# 13:12:55 > Done. +# 13:12:55 > + diff --git a/sql/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err.SunOS b/sql/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err.SunOS --- a/sql/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err.SunOS +++ b/sql/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err.SunOS @@ -71,13 +71,13 @@ stderr of test 'connectto.Bug-2548` in d # 13:12:55 > mclient -lsql -ftest -i -e --host=rig --port=39884 # 13:12:55 > -MAPI = monetdb@alf:34263 +MAPI = monetdb@sofia:38256 QUERY = connect to default; ERROR = !CONNECT TO: DEFAULT is not supported! -MAPI = monetdb@alf:34263 +MAPI = monetdb@sofia:38256 QUERY = connect to 'whatever' port 50001 database 'nonexisting' USER 'monetdb' PASSWORD 'monetdb' LANGUAGE 'mal'; ERROR = !IOException:mapi.connect:Could not connect: getaddrinfo failed: node name or service name not known -MAPI = monetdb@alf:34263 +MAPI = monetdb@sofia:38256 _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
