Changeset: db0e8e6b550b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db0e8e6b550b Modified Files: monetdb5/extras/rapi/Tests/rapi07.stable.err monetdb5/extras/rapi/Tests/rapi07.stable.out monetdb5/mal/Tests/All monetdb5/mal/Tests/dynamicload.stable.err monetdb5/mal/Tests/flowchk.stable.err monetdb5/mal/Tests/parseErrors.stable.err monetdb5/mal/Tests/parseErrors.stable.out monetdb5/mal/Tests/pithole.stable.err monetdb5/mal/Tests/recycle01.stable.out monetdb5/mal/Tests/recycle02.stable.out monetdb5/mal/Tests/tst002.stable.err monetdb5/mal/Tests/tst003.stable.err monetdb5/mal/Tests/tst007.stable.err monetdb5/mal/Tests/tst007.stable.out monetdb5/mal/Tests/tst008.stable.err monetdb5/mal/Tests/tst010.stable.err monetdb5/mal/Tests/tst013.stable.err monetdb5/mal/Tests/tst019.stable.err monetdb5/mal/Tests/tst019.stable.out monetdb5/mal/Tests/tst027.stable.err monetdb5/mal/Tests/tst027.stable.out monetdb5/mal/Tests/tst036.stable.err monetdb5/mal/Tests/tst036.stable.out monetdb5/mal/Tests/tst038.stable.err monetdb5/mal/Tests/tst050.malC monetdb5/mal/Tests/tst050.stable.err monetdb5/mal/Tests/tst054.stable.err monetdb5/mal/Tests/tst058.stable.err monetdb5/mal/Tests/tst070.stable.err monetdb5/mal/Tests/tst071.stable.err monetdb5/mal/Tests/tst071.stable.out monetdb5/mal/Tests/tst102.stable.err monetdb5/mal/Tests/tst104.stable.err monetdb5/mal/Tests/tst105.stable.err monetdb5/mal/Tests/tst105a.stable.err monetdb5/mal/Tests/tst106.stable.err monetdb5/mal/Tests/tst108.stable.err monetdb5/mal/Tests/tst109.stable.err monetdb5/mal/Tests/tst115.stable.err monetdb5/mal/Tests/tst150.stable.err monetdb5/mal/Tests/tst1500.stable.err monetdb5/mal/Tests/tst1500.stable.out monetdb5/mal/Tests/tst161.stable.err monetdb5/mal/Tests/tst163.stable.err monetdb5/mal/Tests/tst163.stable.out monetdb5/mal/Tests/tst200.stable.err monetdb5/mal/Tests/tst200.stable.out monetdb5/mal/Tests/tst201.malC monetdb5/mal/Tests/tst201.stable.out monetdb5/mal/Tests/tst272.stable.err monetdb5/mal/Tests/tst272.stable.out monetdb5/mal/Tests/tst275.stable.err monetdb5/mal/Tests/tst275.stable.out monetdb5/mal/Tests/tst302.stable.err monetdb5/mal/Tests/tst303.stable.err monetdb5/mal/Tests/tst305.stable.err monetdb5/mal/Tests/tst611.stable.err monetdb5/mal/Tests/tst660.stable.err monetdb5/mal/Tests/tst755.stable.err monetdb5/mal/Tests/tst760.stable.err monetdb5/mal/Tests/tst804.stable.err monetdb5/mal/Tests/tst840.stable.err monetdb5/mal/Tests/tst840.stable.out monetdb5/mal/Tests/tst850.malC monetdb5/mal/Tests/tst900.stable.err monetdb5/mal/Tests/tst903.stable.out monetdb5/mal/Tests/tst904.malC monetdb5/mal/Tests/tst905.malC monetdb5/mal/Tests/tst907.malC monetdb5/optimizer/Tests/ARexample.stable.out monetdb5/optimizer/Tests/All monetdb5/optimizer/Tests/CXexample.stable.out monetdb5/optimizer/Tests/DCexample.stable.out monetdb5/optimizer/Tests/JPexample.stable.out monetdb5/optimizer/Tests/ifthencst.stable.out monetdb5/optimizer/Tests/inline04.malC monetdb5/optimizer/Tests/inline05.malC monetdb5/optimizer/Tests/inline06.malC monetdb5/optimizer/Tests/inline07.malC monetdb5/optimizer/Tests/inline08.malC monetdb5/optimizer/Tests/inline09.malC monetdb5/optimizer/Tests/inline10.malC monetdb5/optimizer/Tests/inlineCst.malC monetdb5/optimizer/Tests/inlineFunction1.stable.out monetdb5/optimizer/Tests/joinchain.stable.out monetdb5/optimizer/Tests/manifold2.stable.out monetdb5/optimizer/Tests/reorder00.stable.out monetdb5/optimizer/Tests/tst4001.stable.out monetdb5/optimizer/Tests/tst4004.stable.out Branch: default Log Message:
Approve output diffs (truncated from 3366 to 300 lines): diff --git a/monetdb5/extras/rapi/Tests/rapi07.stable.err b/monetdb5/extras/rapi/Tests/rapi07.stable.err --- a/monetdb5/extras/rapi/Tests/rapi07.stable.err +++ b/monetdb5/extras/rapi/Tests/rapi07.stable.err @@ -1,11 +1,11 @@ stderr of test 'rapi07` in directory 'monetdb5/extras/rapi` itself: -# 20:20:45 > -# 20:20:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38117" "--set" "mapi_usock=/var/tmp/mtest-2827/.s.monetdb.38117" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/manegold/_/Monet/HG/Oct2014/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_monetdb5_extras_rapi" "--set" "mal_listing=2" "--set" "embedded_r=yes" -# 20:20:45 > +# 13:48:18 > +# 13:48:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30912" "--set" "mapi_usock=/var/tmp/mtest-24529/.s.monetdb.30912" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_extras_rapi" "--set" "mal_listing=2" "--set" "embedded_r=yes" +# 13:48:18 > -# builtin opt gdk_dbpath = /ufs/manegold/_/Monet/HG/Oct2014/prefix/--disable-debug_--enable-assert_--enable-optimize/var/monetdb5/dbfarm/demo +# builtin opt gdk_dbpath = /export/scratch1/mk/default//Linux/var/monetdb5/dbfarm/demo # builtin opt gdk_debug = 0 # builtin opt gdk_vmtrim = no # builtin opt monet_prompt = > @@ -17,21 +17,21 @@ stderr of test 'rapi07` in directory 'mo # builtin opt sql_debug = 0 # cmdline opt gdk_nr_threads = 0 # cmdline opt mapi_open = true -# cmdline opt mapi_port = 38117 -# cmdline opt mapi_usock = /var/tmp/mtest-2827/.s.monetdb.38117 +# cmdline opt mapi_port = 30912 +# cmdline opt mapi_usock = /var/tmp/mtest-24529/.s.monetdb.30912 # cmdline opt monet_prompt = # cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /ufs/manegold/_/Monet/HG/Oct2014/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_monetdb5_extras_rapi +# cmdline opt gdk_dbpath = /export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_extras_rapi # cmdline opt mal_listing = 2 # cmdline opt embedded_r = yes # cmdline opt gdk_debug = 536870922 -# 20:20:45 > -# 20:20:45 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-2827" "--port=38117" -# 20:20:45 > +# 13:48:19 > +# 13:48:19 > "mclient" "-lmal" "-ftest" "-Eutf-8" "--host=/var/tmp/mtest-24529" "--port=30912" +# 13:48:19 > -# 20:20:45 > -# 20:20:45 > "Done." -# 20:20:45 > +# 13:48:19 > +# 13:48:19 > "Done." +# 13:48:19 > diff --git a/monetdb5/extras/rapi/Tests/rapi07.stable.out b/monetdb5/extras/rapi/Tests/rapi07.stable.out --- a/monetdb5/extras/rapi/Tests/rapi07.stable.out +++ b/monetdb5/extras/rapi/Tests/rapi07.stable.out @@ -1,35 +1,37 @@ stdout of test 'rapi07` in directory 'monetdb5/extras/rapi` itself: -# 20:20:45 > -# 20:20:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38117" "--set" "mapi_usock=/var/tmp/mtest-2827/.s.monetdb.38117" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/manegold/_/Monet/HG/Oct2014/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_monetdb5_extras_rapi" "--set" "mal_listing=2" "--set" "embedded_r=yes" -# 20:20:45 > +# 13:48:18 > +# 13:48:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30912" "--set" "mapi_usock=/var/tmp/mtest-24529/.s.monetdb.30912" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_extras_rapi" "--set" "mal_listing=2" "--set" "embedded_r=yes" +# 13:48:18 > -# MonetDB 5 server v11.19.0 +# MonetDB 5 server v11.22.0 # This is an unreleased version # Serving database 'mTests_monetdb5_extras_rapi', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Found 15.591 GiB available main-memory. +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 15.589 GiB available main-memory. # Copyright (c) 1993-July 2008 CWI. # Copyright (c) August 2008-2015 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:38117/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-2827/.s.monetdb.38117 +# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:30912/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-24529/.s.monetdb.30912 # MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Start reading the write-ahead log 'sql_logs/sql/log.4' +# Finished reading the write-ahead log 'sql_logs/sql/log.4' +# Finished processing logs sql/sql_logs # MonetDB/SQL module loaded # MonetDB/R module loaded Ready. -# 12:48:51 > -# 12:48:51 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-8117" "--port=30681" -# 12:48:51 > +# 13:48:19 > +# 13:48:19 > "mclient" "-lmal" "-ftest" "-Eutf-8" "--host=/var/tmp/mtest-24529" "--port=30912" +# 13:48:19 > -#io.printf("#~BeginVariableOutput~#\n"); #~BeginVariableOutput~# -#io.print(x,y); #--------------------------# -# h t t # name +# t t t # name # void dbl dbl # type #--------------------------# [ 0@0, -10, 2.970300062e-11 ] @@ -232,10 +234,9 @@ Ready. [ 197@0, 9.700000294, 0.1323175171 ] [ 198@0, 9.800000295, 0.1326855763 ] [ 199@0, 9.900000297, 0.1329069029 ] -#io.printf("#~EndVariableOutput~#\n"); #~EndVariableOutput~# -# 12:48:51 > -# 12:48:51 > "Done." -# 12:48:51 > +# 13:48:19 > +# 13:48:19 > "Done." +# 13:48:19 > diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All --- a/monetdb5/mal/Tests/All +++ b/monetdb5/mal/Tests/All @@ -20,14 +20,14 @@ tst020 tst021 tst022 tst024 -tst025 +#tst025 tst026 tst027 tst028 tst029 tst030 -tst031 -tst032 +#tst031 +#tst032 tst033 tst034 tst035 diff --git a/monetdb5/mal/Tests/dynamicload.stable.err b/monetdb5/mal/Tests/dynamicload.stable.err --- a/monetdb5/mal/Tests/dynamicload.stable.err +++ b/monetdb5/mal/Tests/dynamicload.stable.err @@ -70,33 +70,31 @@ stderr of test 'dynamicload` in director # cmdline opt mapi_port = 33388 # cmdline opt xrpc_port = 43676 # cmdline opt monet_prompt = -# cmdline opt gdk_dbname = mTests_src_mal -# cmdline opt gdk_debug = 10 -#warning: please don't forget to set your vault key! -#(see /ufs/mk/monet5//Linux/etc/monetdb5.conf) +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal +# cmdline opt mal_listing = 2 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 -# 21:00:40 > -# 21:00:40 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23746" "--port=32905" -# 21:00:40 > +# 13:21:38 > +# 13:21:38 > "mclient" "-lmal" "-ftest" "-Eutf-8" "--host=/var/tmp/mtest-18020" "--port=37961" +# 13:21:38 > -MAPI = (monetdb) /var/tmp/mtest-23746/.s.monetdb.32905 -QUERY = command wrong() -ERROR = !SyntaxException:parseError: - !'address' expected -MAPI = (monetdb) /var/tmp/mtest-23746/.s.monetdb.32905 -QUERY = address UNKOWNaddress -ERROR = !SyntaxException:parseError:address UNKOWNaddress - !SyntaxException:parseError: ^';' expected -MAPI = (monetdb) /var/tmp/mtest-23746/.s.monetdb.32905 -QUERY = comment "Should not be callable"; -ERROR = !SyntaxException:parseError:comment "Should not be callable"; - !SyntaxException:parseError: ^';' expected -MAPI = (monetdb) /var/tmp/mtest-23746/.s.monetdb.32905 -QUERY = wrong(); -ERROR = !TypeException:user.main[1]:object code for command user.wrong missing - !TypeException:user.main[1]:'user.wrong' undefined in: user.wrong(); +MAPI = (monetdb) /var/tmp/mtest-18020/.s.monetdb.37961 +QUERY = # examples of non-bindable instructions + + command wrong() + address UNKOWNaddress + comment "Should not be callable"; + + wrong(); + + #load unknown library + library UNKNOWlib; +ERROR = !TypeException:user.main[2]:object code for command user.wrong missing + !TypeException:user.main[2]:'user.wrong' undefined in: user.wrong(); -# 21:00:41 > -# 21:00:41 > "Done." -# 21:00:41 > +# 13:21:38 > +# 13:21:38 > "Done." +# 13:21:38 > diff --git a/monetdb5/mal/Tests/flowchk.stable.err b/monetdb5/mal/Tests/flowchk.stable.err --- a/monetdb5/mal/Tests/flowchk.stable.err +++ b/monetdb5/mal/Tests/flowchk.stable.err @@ -69,8 +69,15 @@ stderr of test 'flowchk` in directory 'm # 07:33:12 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-15547" "--port=37088" # 07:33:12 > -MAPI = (monetdb) /var/tmp/mtest-15547/.s.monetdb.37088 -QUERY = end tst; +MAPI = (monetdb) /var/tmp/mtest-18020/.s.monetdb.37961 +QUERY = function tst(); + barrier go:=true; + a:=bat.new(:oid,:int); + io.print(a); + exit go; + c:=a; + end tst; +ERROR = !TypeException:user.tst[5]:'a' may not be used before being initialized # 07:33:12 > diff --git a/monetdb5/mal/Tests/parseErrors.stable.err b/monetdb5/mal/Tests/parseErrors.stable.err --- a/monetdb5/mal/Tests/parseErrors.stable.err +++ b/monetdb5/mal/Tests/parseErrors.stable.err @@ -12,8 +12,10 @@ stderr of test 'parseErrors` in director # 21:00:37 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23746" "--port=32905" # 21:00:37 > -MAPI = (monetdb) /var/tmp/mtest-23746/.s.monetdb.32905 +MAPI = (monetdb) /var/tmp/mtest-18020/.s.monetdb.37961 QUERY = K := := + io.print(1); + io.print(2); ERROR = !SyntaxException:parseError:K := := !SyntaxException:parseError: ^Type identifier expected !SyntaxException:parseError:K := := diff --git a/monetdb5/mal/Tests/parseErrors.stable.out b/monetdb5/mal/Tests/parseErrors.stable.out --- a/monetdb5/mal/Tests/parseErrors.stable.out +++ b/monetdb5/mal/Tests/parseErrors.stable.out @@ -29,10 +29,6 @@ Ready. # 21:00:37 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23746" "--port=32905" # 21:00:37 > -#io.print(1); -[ 1 ] -#io.print(2); -[ 2 ] # 21:00:37 > # 21:00:37 > "Done." diff --git a/monetdb5/mal/Tests/pithole.stable.err b/monetdb5/mal/Tests/pithole.stable.err --- a/monetdb5/mal/Tests/pithole.stable.err +++ b/monetdb5/mal/Tests/pithole.stable.err @@ -66,8 +66,9 @@ stderr of test 'pithole` in directory 'm # 21:00:41 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23746" "--port=32905" # 21:00:41 > -MAPI = (monetdb) /var/tmp/mtest-23746/.s.monetdb.32905 -QUERY = user.main(); +MAPI = (monetdb) /var/tmp/mtest-18020/.s.monetdb.37961 +QUERY = #challenge the runtime stack protection + user.main(); ERROR = !MALException:mal.interpreter:Recursive call limit reached. # 21:00:41 > diff --git a/monetdb5/mal/Tests/recycle01.stable.out b/monetdb5/mal/Tests/recycle01.stable.out --- a/monetdb5/mal/Tests/recycle01.stable.out +++ b/monetdb5/mal/Tests/recycle01.stable.out @@ -59,11 +59,11 @@ end sql.qry; [ 7@0, 8@0 ] [ 8@0, 9@0 ] [ 9@0, 10@0 ] -[ "reuse BAT" ] -#REUSED [ 0] m := sql.mvc(); -#REUSED [ 1] x:bat[:oid,:oid] := sql.tid(m,"sys","tbl"); -#REUSED [ 2] b:bat[:oid,:int] := sql.bind(m,"sys","tbl","col",0); -#REUSED [ 3] s := algebra.subselect(b,x,low,hgh,true,true,false); +[ reuse BAT ] +#REUSED [ 0] 476858 (usec) # 1 := sql.mvc(); +#REUSED [ 1] 476875 (usec) # <tmp_76> := sql.tid(1,"sys","tbl"); +#REUSED [ 2] 476892 (usec) # <tmp_371> := sql.bind(1,"sys","tbl","col",0); +#REUSED [ 3] 476912 (usec) # <tmp_471> := algebra.subselect(<tmp_371>,<tmp_76>,1,10,true,true,false); #--------------------------# # t h # name # void oid # type diff --git a/monetdb5/mal/Tests/recycle02.stable.out b/monetdb5/mal/Tests/recycle02.stable.out --- a/monetdb5/mal/Tests/recycle02.stable.out +++ b/monetdb5/mal/Tests/recycle02.stable.out @@ -62,13 +62,12 @@ end sql.qry; [ 7@0, 8@0 ] [ 8@0, 9@0 ] [ 9@0, 10@0 ] -[ "zoom in" ] -#REUSED [ 0] m := sql.mvc(); -#REUSED [ 1] x:bat[:oid,:oid] := sql.tid(m,"sys","tbl"); -#REUSED [ 2] b:bat[:oid,:int] := sql.bind(m,"sys","tbl","col",0); -#RECYCLEreuse subselect using candidate list X_7 := algebra.subselect(<tmp_1034>,<tmp_1033>,1,10,true,true,false); -#RECYCLE [ 4] X_11 := algebra.subselect(<tmp_1034>,<tmpr_1036>,1,5,true,true,false); -#REUSED [ 3] s := algebra.subselect(b,x,low,hgh,true,true,false); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
