Changeset: f22147ecc449 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f22147ecc449 Added Files: monetdb5/extras/rapi/Tests/rapi00.malC monetdb5/extras/rapi/Tests/rapi01.malC monetdb5/extras/rapi/Tests/rapi02.malC monetdb5/extras/rapi/Tests/rapi03.malC monetdb5/extras/rapi/Tests/rapi04.malC monetdb5/extras/rapi/Tests/rapi05.malC monetdb5/extras/rapi/Tests/rapi06.malC monetdb5/extras/rapi/Tests/rapi07.malC monetdb5/extras/rapi/Tests/rapi08.malC Removed Files: monetdb5/extras/rapi/Tests/rapi00.mal monetdb5/extras/rapi/Tests/rapi00.stable.err monetdb5/extras/rapi/Tests/rapi00.stable.out monetdb5/extras/rapi/Tests/rapi01.mal monetdb5/extras/rapi/Tests/rapi01.stable.err monetdb5/extras/rapi/Tests/rapi01.stable.out monetdb5/extras/rapi/Tests/rapi02.mal monetdb5/extras/rapi/Tests/rapi02.stable.err monetdb5/extras/rapi/Tests/rapi02.stable.out monetdb5/extras/rapi/Tests/rapi03.mal monetdb5/extras/rapi/Tests/rapi03.stable.err monetdb5/extras/rapi/Tests/rapi03.stable.out monetdb5/extras/rapi/Tests/rapi04.mal monetdb5/extras/rapi/Tests/rapi04.stable.err monetdb5/extras/rapi/Tests/rapi04.stable.out monetdb5/extras/rapi/Tests/rapi05.mal monetdb5/extras/rapi/Tests/rapi05.stable.err monetdb5/extras/rapi/Tests/rapi05.stable.out monetdb5/extras/rapi/Tests/rapi06.mal monetdb5/extras/rapi/Tests/rapi06.stable.err monetdb5/extras/rapi/Tests/rapi06.stable.out monetdb5/extras/rapi/Tests/rapi07.mal monetdb5/extras/rapi/Tests/rapi07.stable.err monetdb5/extras/rapi/Tests/rapi07.stable.out monetdb5/extras/rapi/Tests/rapi08.mal monetdb5/extras/rapi/Tests/rapi08.stable.err monetdb5/extras/rapi/Tests/rapi08.stable.out monetdb5/extras/rapi/Tests/rapi11.sql Modified Files: monetdb5/extras/rapi/rapi.c monetdb5/extras/rapi/rapi.h monetdb5/extras/rapi/rapi.mal sql/backends/monet5/Tests/rapi06.sql sql/backends/monet5/Tests/rapi06.stable.out sql/backends/monet5/Tests/rapi07.sql sql/backends/monet5/Tests/rapi07.stable.out Branch: RIntegration-default Log Message:
Fixes and approved output for MAL test cases Unterschiede (gekürzt von 1752 auf 300 Zeilen): diff --git a/monetdb5/extras/rapi/Tests/rapi00.mal b/monetdb5/extras/rapi/Tests/rapi00.malC rename from monetdb5/extras/rapi/Tests/rapi00.mal rename to monetdb5/extras/rapi/Tests/rapi00.malC --- a/monetdb5/extras/rapi/Tests/rapi00.mal +++ b/monetdb5/extras/rapi/Tests/rapi00.malC @@ -13,7 +13,7 @@ bat.append(b,1189641421); io.print(b); -r:bat[:oid,:dbl] := rapi.eval("print(arg1);someval <- Re(fft(arg1)); print(someval); return(someval);",b); +r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"print(arg1);someval <- Re(fft(arg1)); print(someval); return(someval);",b); io.print(r); diff --git a/monetdb5/extras/rapi/Tests/rapi00.stable.err b/monetdb5/extras/rapi/Tests/rapi00.stable.err deleted file mode 100644 --- a/monetdb5/extras/rapi/Tests/rapi00.stable.err +++ /dev/null @@ -1,29 +0,0 @@ -stderr of test 'rapi00` in directory 'monetdb5/extras/rapi` itself: - - -# 19:43:24 > -# 19:43:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31781" "--set" "mapi_usock=/var/tmp/mtest-13409/.s.monetdb.31781" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/rapi//Linux/var/MonetDB/mTests_monetdb5_extras_rapi" "rapi00.mal" -# 19:43:24 > - -# builtin opt gdk_dbpath = /export/scratch1/mk/rapi//Linux/var/monetdb5/dbfarm/demo -# builtin opt gdk_debug = 0 -# 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 mapi_open = true -# cmdline opt mapi_port = 31781 -# cmdline opt mapi_usock = /var/tmp/mtest-13409/.s.monetdb.31781 -# cmdline opt monet_prompt = -# cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /export/scratch1/mk/rapi//Linux/var/MonetDB/mTests_monetdb5_extras_rapi - -# 19:43:25 > -# 19:43:25 > "Done." -# 19:43:25 > - diff --git a/monetdb5/extras/rapi/Tests/rapi00.stable.out b/monetdb5/extras/rapi/Tests/rapi00.stable.out deleted file mode 100644 --- a/monetdb5/extras/rapi/Tests/rapi00.stable.out +++ /dev/null @@ -1,77 +0,0 @@ -stdout of test 'rapi00` in directory 'monetdb5/extras/rapi` itself: - - -# 19:43:24 > -# 19:43:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31781" "--set" "mapi_usock=/var/tmp/mtest-13409/.s.monetdb.31781" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/rapi//Linux/var/MonetDB/mTests_monetdb5_extras_rapi" "rapi00.mal" -# 19:43:24 > - -# MonetDB 5 server v11.16.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. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2014 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:31781/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-13409/.s.monetdb.31781 -# MonetDB/GIS module loaded -# MonetDB/JAQL module loaded -# MonetDB/SQL module loaded -function user.main():void; -# Hannes Muehleisen example - 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); - r:bat[:oid,:dbl] := rapi.eval("print(arg1);someval <- Re(fft(arg1)); print(someval); return(someval);",b); - io.print(r); -end main; -#--------------------------# -# h t # name -# void int # type -#--------------------------# -[ 0@0, 1804289383 ] -[ 1@0, 846930886 ] -[ 2@0, 1681692777 ] -[ 3@0, 1714636915 ] -[ 4@0, 1957747793 ] -[ 5@0, 424238335 ] -[ 6@0, 719885386 ] -[ 7@0, 1649760492 ] -[ 8@0, 596516649 ] -[ 9@0, 1189641421 ] -# User R expression: print(arg1);someval <- Re(fft(arg1)); print(someval); return(someval); -# Executed R expression ret <- as.data.frame((function(arg1){print(arg1);someval <- Re(fft(arg1)); print(someval); return(someval);})(arg1),nm=NA,stringsAsFactors=F) - -# [1]# 1804289383# 846930886# 1681692777# 1714636915# 1957747793# 424238335# -# [7]# 719885386# 1649760492# 596516649# 1189641421# -# [1]# 12585340037# 525771363# -879667492# 2456894288# 158316769# 934923939# -# [7]# 158316769# 2456894288# -879667492# 525771363# -#--------------------------# -# h t # name -# void dbl # type -#--------------------------# -[ 0@0, 12585340037 ] -[ 1@0, 525771362.90836447 ] -[ 2@0, -879667492.32359219 ] -[ 3@0, 2456894287.5916357 ] -[ 4@0, 158316768.82359338 ] -[ 5@0, 934923939 ] -[ 6@0, 158316768.82359338 ] -[ 7@0, 2456894287.5916352 ] -[ 8@0, -879667492.32359219 ] -[ 9@0, 525771362.90836453 ] - -# 19:43:25 > -# 19:43:25 > "Done." -# 19:43:25 > - diff --git a/monetdb5/extras/rapi/Tests/rapi01.mal b/monetdb5/extras/rapi/Tests/rapi01.malC rename from monetdb5/extras/rapi/Tests/rapi01.mal rename to monetdb5/extras/rapi/Tests/rapi01.malC --- a/monetdb5/extras/rapi/Tests/rapi01.mal +++ b/monetdb5/extras/rapi/Tests/rapi01.malC @@ -15,13 +15,13 @@ io.print(b); # illegal variables being used -r:bat[:oid,:dbl] := rapi.eval("someresult <- Re(fft(somevalue));",b); -r:bat[:oid,:dbl] := rapi.eval("someresult <- Re(fft(arg2));",b); -r:bat[:oid,:dbl] := rapi.eval("ret0 <- Re(fft(somevalue));",b); -r:bat[:oid,:dbl] := rapi.eval("ret1 <- Re(fft(arg2));",b); -r:bat[:oid,:dbl] := rapi.eval("ret0 <- Re(fft(arg5));",b); +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("ret0 <- Re(fft(arg2) ) );",b); +r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg2) ) );",b); io.print(r); diff --git a/monetdb5/extras/rapi/Tests/rapi01.stable.err b/monetdb5/extras/rapi/Tests/rapi01.stable.err deleted file mode 100644 --- a/monetdb5/extras/rapi/Tests/rapi01.stable.err +++ /dev/null @@ -1,29 +0,0 @@ -stderr of test 'rapi01` in directory 'monetdb5/extras/rapi` itself: - - -# 15:45:24 > -# 15:45:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32234" "--set" "mapi_usock=/var/tmp/mtest-13776/.s.monetdb.32234" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch2/hannes/monetdb-rint-install/var/MonetDB/mTests_monetdb5_extras_rapi" "rapi01.mal" -# 15:45:24 > - -# builtin opt gdk_dbpath = /export/scratch2/hannes/monetdb-rint-install/var/monetdb5/dbfarm/demo -# builtin opt gdk_debug = 0 -# 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 mapi_open = true -# cmdline opt mapi_port = 32234 -# cmdline opt mapi_usock = /var/tmp/mtest-13776/.s.monetdb.32234 -# cmdline opt monet_prompt = -# cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /export/scratch2/hannes/monetdb-rint-install/var/MonetDB/mTests_monetdb5_extras_rapi - -# 15:45:24 > -# 15:45:24 > "Done." -# 15:45:24 > - diff --git a/monetdb5/extras/rapi/Tests/rapi01.stable.out b/monetdb5/extras/rapi/Tests/rapi01.stable.out deleted file mode 100644 --- a/monetdb5/extras/rapi/Tests/rapi01.stable.out +++ /dev/null @@ -1,71 +0,0 @@ -stdout of test 'rapi01` in directory 'monetdb5/extras/rapi` itself: - - -# 15:45:24 > -# 15:45:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32234" "--set" "mapi_usock=/var/tmp/mtest-13776/.s.monetdb.32234" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch2/hannes/monetdb-rint-install/var/MonetDB/mTests_monetdb5_extras_rapi" "rapi01.mal" -# 15:45:24 > - -# MonetDB 5 server v11.16.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.592 GiB available main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://bristol.ins.cwi.nl:32234/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-13776/.s.monetdb.32234 -# MonetDB/GIS module loaded -# MonetDB/JAQL module loaded -# MonetDB/SQL module loaded -function user.main():void; -# 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("someresult <- Re(fft(somevalue));",b); - r:bat[:oid,:dbl] := rapi.eval("someresult <- Re(fft(arg2));",b); - r:bat[:oid,:dbl] := rapi.eval("ret0 <- Re(fft(somevalue));",b); - r:bat[:oid,:dbl] := rapi.eval("ret1 <- Re(fft(arg2));",b); - r:bat[:oid,:dbl] := rapi.eval("ret0 <- Re(fft(arg5));",b); -# illegal R expressions - r:bat[:oid,:dbl] := rapi.eval("ret0 <- Re(fft(arg2) ) );",b); - io.print(r); -end main; -#--------------------------# -# h t # name -# void int # type -#--------------------------# -[ 0@0, 1804289383 ] -[ 1@0, 846930886 ] -[ 2@0, 1681692777 ] -[ 3@0, 1714636915 ] -[ 4@0, 1957747793 ] -[ 5@0, 424238335 ] -[ 6@0, 719885386 ] -[ 7@0, 1649760492 ] -[ 8@0, 596516649 ] -[ 9@0, 1189641421 ] -# Error in fft(somevalue) : object 'somevalue' not found -Calls: as.data.frame -> <Anonymous> -> fft -!MALException:rapi.eval:Error running R expression 'someresult <- Re(fft(somevalue));'. Error message: Error in fft(somevalue) : object 'somevalue' not found -!Calls: as.data.frame -> <Anonymous> -> fft - - - - - -# 15:22:47 > -# 15:22:47 > "Done." -# 15:22:47 > - diff --git a/monetdb5/extras/rapi/Tests/rapi02.mal b/monetdb5/extras/rapi/Tests/rapi02.malC rename from monetdb5/extras/rapi/Tests/rapi02.mal rename to monetdb5/extras/rapi/Tests/rapi02.malC --- a/monetdb5/extras/rapi/Tests/rapi02.mal +++ b/monetdb5/extras/rapi/Tests/rapi02.malC @@ -8,7 +8,7 @@ bat.append(bbit,0:bit); bat.append(bbit,1:bit); bat.append(bbit,0:bit); bat.append(bbit,nil:bit); -rbit:bat[:oid,:dbl] := rapi.eval("Re(fft(na.omit(arg1)))",bbit); +rbit:bat[:oid,:dbl] := rapi.eval(nil:ptr,"Re(fft(na.omit(arg1)))",bbit); io.print(rbit); bbte:= bat.new(:oid,:bte); @@ -17,7 +17,7 @@ bat.append(bbte,84:bte); bat.append(bbte,254:bte); bat.append(bbte,0:bte); bat.append(bbte,nil:bte); -rbte:bat[:oid,:dbl] := rapi.eval("Re(fft(na.omit(arg1)))",bbte); +rbte:bat[:oid,:dbl] := rapi.eval(nil:ptr,"Re(fft(na.omit(arg1)))",bbte); io.print(rbte); bsht:= bat.new(:oid,:sht); @@ -26,7 +26,7 @@ bat.append(bsht,82:sht); bat.append(bsht,0:sht); bat.append(bsht,3276:sht); bat.append(bsht,nil:sht); -rsht:bat[:oid,:dbl] := rapi.eval("Re(fft(na.omit(arg1)))",bsht); +rsht:bat[:oid,:dbl] := rapi.eval(nil:ptr,"Re(fft(na.omit(arg1)))",bsht); io.print(rsht); bint:= bat.new(:oid,:int); @@ -35,7 +35,7 @@ bat.append(bint,846930886:int); bat.append(bint,1681692777:int); bat.append(bint,1714636915:int); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list