Changeset: a387d75a4436 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a387d75a4436 Modified Files: monetdb5/extras/rapi/Tests/rapi01.stable.err monetdb5/extras/rapi/Tests/rapi01.stable.out monetdb5/mal/Tests/recycle01.stable.err monetdb5/mal/Tests/recycle01.stable.out monetdb5/mal/Tests/recycle02.stable.err monetdb5/mal/Tests/recycle02.stable.out monetdb5/mal/Tests/tst1002.malC monetdb5/mal/Tests/tst1002.stable.err monetdb5/mal/Tests/tst1002.stable.out monetdb5/mal/Tests/tst102.stable.err monetdb5/mal/Tests/tst102.stable.out monetdb5/mal/Tests/tst108.stable.err monetdb5/mal/Tests/tst108.stable.out monetdb5/mal/Tests/tst109.stable.err monetdb5/mal/Tests/tst109.stable.out monetdb5/mal/Tests/tst1200.stable.out monetdb5/mal/Tests/tst1203.stable.out monetdb5/mal/Tests/tst1500.stable.out monetdb5/mal/Tests/tst670.malC monetdb5/mal/Tests/tst670.stable.err monetdb5/mal/Tests/tst670.stable.out monetdb5/optimizer/Tests/inline02.stable.out monetdb5/optimizer/Tests/inline03.stable.out monetdb5/optimizer/Tests/inline08.malC monetdb5/optimizer/Tests/inline09.malC monetdb5/optimizer/Tests/inlineIfthen.stable.out monetdb5/optimizer/opt_inline.c Branch: default Log Message:
Approve output diffs (truncated from 1444 to 300 lines): diff --git a/monetdb5/extras/rapi/Tests/rapi01.stable.err b/monetdb5/extras/rapi/Tests/rapi01.stable.err --- a/monetdb5/extras/rapi/Tests/rapi01.stable.err +++ b/monetdb5/extras/rapi/Tests/rapi01.stable.err @@ -30,26 +30,37 @@ stderr of test 'rapi01` in directory 'mo # 11:17:47 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-13991" "--port=31221" # 11:17:47 > -MAPI = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221 -QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <- Re(fft(somevalue));",b); +MAPI = (monetdb) /var/tmp/mtest-23471/.s.monetdb.34866 +QUERY = # Error handling tests + b:= bat.new(:oid,:int); + bat.append(b,1804289383); + bat.append(b,846930886); + bat.append(b,1681692777); + bat.append(b,1714636915); + bat.append(b,1957747793); + bat.append(b,424238335); + bat.append(b,719885386); + bat.append(b,1649760492); + bat.append(b,596516649); + bat.append(b,1189641421); + + io.print(b); + + # illegal variables being used + + r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <- Re(fft(somevalue));",b); + r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <- Re(fft(arg2));",b); + r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(somevalue));",b); + r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret1 <- Re(fft(arg2));",b); + r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg5));",b); + + # illegal R expressions + r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg2) ) );",b); + + io.print(r); ERROR = !MALException:rapi.eval:Error running R expression: Error in fft(somevalue) : object 'somevalue' not found Calls: as.data.frame -> <Anonymous> -> fft -MAPI = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221 -QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <- Re(fft(arg2));",b); -ERROR = !MALException:rapi.eval:Error running R expression: Error in fft(arg2) : object 'arg2' not found Calls: as.data.frame -> <Anonymous> -> fft -MAPI = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221 -QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(somevalue));",b); -ERROR = !MALException:rapi.eval:Error running R expression: Error in fft(somevalue) : object 'somevalue' not found Calls: as.data.frame -> <Anonymous> -> fft -MAPI = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221 -QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret1 <- Re(fft(arg2));",b); -ERROR = !MALException:rapi.eval:Error running R expression: Error in fft(arg2) : object 'arg2' not found Calls: as.data.frame -> <Anonymous> -> fft -MAPI = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221 -QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg5));",b); -ERROR = !MALException:rapi.eval:Error running R expression: Error in fft(arg5) : object 'arg5' not found Calls: as.data.frame -> <Anonymous> -> fft -MAPI = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221 -QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg2) ) );",b); -ERROR = !MALException:rapi.eval:Error parsing R expression 'ret0 <- Re(fft(arg2) ) );'. -# 11:17:47 > -# 11:17:47 > "Done." -# 11:17:47 > +# 20:42:39 > +# 20:42:39 > "Done." +# 20:42:39 > diff --git a/monetdb5/extras/rapi/Tests/rapi01.stable.out b/monetdb5/extras/rapi/Tests/rapi01.stable.out --- a/monetdb5/extras/rapi/Tests/rapi01.stable.out +++ b/monetdb5/extras/rapi/Tests/rapi01.stable.out @@ -39,8 +39,6 @@ Ready. [ 7@0, 1649760492 ] [ 8@0, 596516649 ] [ 9@0, 1189641421 ] -#io.print(r); -[ nil ] # 16:45:16 > # 16:45:16 > "Done." diff --git a/monetdb5/mal/Tests/recycle01.stable.err b/monetdb5/mal/Tests/recycle01.stable.err --- a/monetdb5/mal/Tests/recycle01.stable.err +++ b/monetdb5/mal/Tests/recycle01.stable.err @@ -1,14 +1,37 @@ stderr of test 'recycle01` in directory 'monetdb5/mal` itself: -# 12:49:06 > -# 12:49:06 > mserver5 "--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set mapi_open=true --set xrpc_open=true --set mapi_port=33469 --set xrpc_port=48324 --set monet_prompt= --trace --dbname=mTests_src_mal recycle01.mal -# 12:49:06 > +# 20:44:21 > +# 20:44:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34866" "--set" "mapi_usock=/var/tmp/mtest-23471/.s.monetdb.34866" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal" "--set" "mal_listing=2" "--set" "embedded_r=yes" +# 20:44:21 > -#warning: please don't forget to set your vault key! -#(see /ufs/mk/monet5/Linux/etc/monetdb5.conf) +# 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 = > +# 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 mapi_open = true +# cmdline opt mapi_port = 34866 +# cmdline opt mapi_usock = /var/tmp/mtest-23471/.s.monetdb.34866 +# cmdline opt monet_prompt = +# 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 -# 12:49:07 > -# 12:49:07 > Done. -# 12:49:07 > +# 20:44:21 > +# 20:44:21 > "mclient" "-lmal" "-ftest" "-Eutf-8" "--host=/var/tmp/mtest-23471" "--port=34866" +# 20:44:21 > + +# 20:44:22 > +# 20:44:22 > "Done." +# 20:44:22 > + 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 @@ -1,108 +1,94 @@ stdout of test 'recycle01` in directory 'monetdb5/mal` itself: -# 12:49:06 > -# 12:49:06 > mserver5 "--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set mapi_open=true --set xrpc_open=true --set mapi_port=33469 --set xrpc_port=48324 --set monet_prompt= --trace --dbname=mTests_src_mal recycle01.mal -# 12:49:06 > +# 20:44:21 > +# 20:44:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34866" "--set" "mapi_usock=/var/tmp/mtest-23471/.s.monetdb.34866" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal" "--set" "mal_listing=2" "--set" "embedded_r=yes" +# 20:44:21 > -# MonetDB server v5.5.0, based on kernel v1.23.0 -# Serving database 'mTests_src_mal' -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Found 15.591 GiB available main-memory. +# MonetDB 5 server v11.22.0 +# This is an unreleased version +# Serving database 'mTests_monetdb5_mal', using 8 threads +# 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://vienna.ins.cwi.nl:30811/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-24776/.s.monetdb.30811 +# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:34866/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-23471/.s.monetdb.34866 # MonetDB/GIS module loaded -# MonetDB/JAQL 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. #RECYCLE drop -#RECYCLER CATALOG cached 4 instructions, MAL recycled = 4 total MAL executed = 91 memory= 144 total searchtime=27.25(usec) savings=2632082 +#RECYCLER CATALOG cached 4 instructions, MAL recycled = 4 total MAL executed = 83 memory= 144 total searchtime=30.75(usec) savings=3843736 # CL lru cnt ticks rd wr Instr -#0 2 657959 0 0 # 1 := sql.mvc(); -#1 2 658003 0 96 # <tmp_36> := sql.tid(1,"sys","tbl"); -#2 2 658040 0 48 # <tmp_316> := sql.bind(1,"sys","tbl","col",0); -#3 2 658080 144 0 # <tmp_440> := algebra.subselect(<tmp_316>,<tmp_36>,1,10,true,true,false); +#0 2 960904 0 0 # 1 := sql.mvc(); +#1 2 960923 0 96 # <tmp_34> := sql.tid(1,"sys","tbl"); +#2 2 960943 0 48 # <tmp_314> := sql.bind(1,"sys","tbl","col",0); +#3 2 960966 144 0 # <tmp_436> := algebra.subselect(<tmp_314>,<tmp_34>,1,10,true,true,false); -# 20:49:38 > -# 20:49:38 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-22767" "--port=33890" -# 20:49:38 > +# 20:44:21 > +# 20:44:21 > "mclient" "-lmal" "-ftest" "-Eutf-8" "--host=/var/tmp/mtest-23471" "--port=34866" +# 20:44:21 > -#mdb.list("user","qry"); function sql.qry(low:int,hgh:int):void; m := sql.mvc(); - x:bat[:oid,:oid] := sql.tid(m,"sys","tbl"); - b:bat[:oid,:int] := sql.bind(m,"sys","tbl","col",0); + x:bat[:oid,:oid] := sql.tid(m,"sys","tbl"); + b:bat[:oid,:int] := sql.bind(m,"sys","tbl","col",0); s := algebra.subselect(b,x,low,hgh,true,true,false); io.print(s); end sql.qry; -[ "start" ] -#RECYCLE [ 0] X_0 := sql.mvc(); -#RECYCLE [ 1] X_1 := sql.tid(1,"sys","tbl"); -#RECYCLE [ 2] X_4 := sql.bind(1,"sys","tbl","col",0); -#RECYCLE [ 3] X_7 := algebra.subselect(<tmp_1034>,<tmp_1033>,1,10,true,true,false); +[ "start" ] +#RECYCLE [ 0] cost 5 mem 0 srch -nan # 1 := sql.mvc(); +#RECYCLE [ 1] cost 64 mem 96 srch 27.00 # <tmp_34> := sql.tid(1,"sys","tbl"); +#RECYCLE [ 2] cost 46 mem 48 srch 29.50 # <tmp_314> := sql.bind(1,"sys","tbl","col",0); +#RECYCLE [ 3] cost 22 mem 0 srch 30.00 # <tmp_436> := algebra.subselect(<tmp_314>,<tmp_34>,1,10,true,true,false); #--------------------------# -# t h # name -# void oid # type +# h t # name +# void void # type #--------------------------# -[ 0@0, 1@0 ] -[ 1@0, 2@0 ] -[ 2@0, 3@0 ] -[ 3@0, 4@0 ] -[ 4@0, 5@0 ] -[ 5@0, 6@0 ] -[ 6@0, 7@0 ] -[ 7@0, 8@0 ] -[ 8@0, 9@0 ] -[ 9@0, 10@0 ] -[ 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); +[ 0@0, 1@0 ] +[ 1@0, 2@0 ] +[ 2@0, 3@0 ] +[ 3@0, 4@0 ] +[ 4@0, 5@0 ] +[ 5@0, 6@0 ] +[ 6@0, 7@0 ] +[ 7@0, 8@0 ] +[ 8@0, 9@0 ] +[ 9@0, 10@0 ] +[ "reuse BAT" ] +#REUSED [ 0] 960904 (usec) # 1 := sql.mvc(); +#REUSED [ 1] 960923 (usec) # <tmp_34> := sql.tid(1,"sys","tbl"); +#REUSED [ 2] 960943 (usec) # <tmp_314> := sql.bind(1,"sys","tbl","col",0); +#REUSED [ 3] 960966 (usec) # <tmp_436> := algebra.subselect(<tmp_314>,<tmp_34>,1,10,true,true,false); #--------------------------# -# t h # name -# void oid # type +# h t # name +# void void # type #--------------------------# -[ 0@0, 1@0 ] -[ 1@0, 2@0 ] -[ 2@0, 3@0 ] -[ 3@0, 4@0 ] -[ 4@0, 5@0 ] -[ 5@0, 6@0 ] -[ 6@0, 7@0 ] -[ 7@0, 8@0 ] -[ 8@0, 9@0 ] -[ 9@0, 10@0 ] -#RECYCLER CATALOG admission ADM_ALL -#CACHE= policy PROFIT limit= 20000 -#RESOURCES hard stmt = 20000 hard var = 100000 hard mem=16741163008 -#recycled = 3 incache= 4 executed = 1536 memory(KB)= 144 PersBat memory=0 -#RPremoved = 0 RPactive= 4 RPmisses = 0 -#Cache search time= 0(usec) +[ 0@0, 1@0 ] +[ 1@0, 2@0 ] +[ 2@0, 3@0 ] +[ 3@0, 4@0 ] +[ 4@0, 5@0 ] +[ 5@0, 6@0 ] +[ 6@0, 7@0 ] +[ 7@0, 8@0 ] +[ 8@0, 9@0 ] +[ 9@0, 10@0 ] +#RECYCLER CATALOG cached 4 instructions, MAL recycled = 4 total MAL executed = 81 memory= 144 total searchtime=30.75(usec) savings=3843736 # CL lru cnt ticks rd wr Instr -# 0 946139 2 47 0 0 X_0 := sql.mvc(); -# 1 946150 2 60 96 0 X_1 := sql.tid(1,"sys","tbl"); -# 2 946161 2 41 48 0 X_4 := sql.bind(1,"sys","tbl","col",0); -# 3 946173 2 36 80 144 X_7 := algebra.subselect(<tmp_1034>,<tmp_1033>,1,10,true,true,false); -#RECYCLE shutdown -#[0] _0 = 1 :int constant -#[1] _1 = <tmp_1033> :BAT constant -#[2] _2 = "sys" :str constant -#[3] _3 = "tbl" :str constant -#[4] _4 = <tmp_1034> :BAT constant -#[5] _5 = "col" :str constant -#[6] _6 = 0 :int constant -#[7] _7 = <tmpr_1036> :BAT constant -#[8] _8 = 10 :int constant -#[9] _9 = true :bit constant -#[10] _10 = false :bit constant +#0 2 960904 0 0 # 1 := sql.mvc(); +#1 2 960923 0 96 # <tmp_34> := sql.tid(1,"sys","tbl"); +#2 2 960943 0 48 # <tmp_314> := sql.bind(1,"sys","tbl","col",0); +#3 2 960966 144 0 # <tmp_436> := algebra.subselect(<tmp_314>,<tmp_34>,1,10,true,true,false); -# 12:49:07 > -# 12:49:07 > Done. -# 12:49:07 > +# 20:44:22 > +# 20:44:22 > "Done." +# 20:44:22 > _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
