Changeset: 5d30c9f1a246 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d30c9f1a246
Modified Files:
java/build.xml
monetdb5/extras/rapi/Tests/rapi01.stable.err
sql/backends/monet5/Tests/rapi09.stable.err
Branch: default
Log Message:
merged
diffs (189 lines):
diff --git a/java/build.xml b/java/build.xml
--- a/java/build.xml
+++ b/java/build.xml
@@ -89,10 +89,12 @@ Copyright 2008-2015 MonetDB B.V.
<!-- jar targets -->
<target name="jar_jdbc" depends="compile_mcl,compile_jdbc"
unless="uptodate.jdbc-jar">
+ <echo file="${builddir}/META-INF/services/java.sql.Driver"
append="false">nl.cwi.monetdb.jdbc.MonetDriver</echo>
<jar jarfile="${jdbc-jar}">
<fileset dir="${builddir}">
<include name="${jdbc-package}/**/*.class" />
<include name="${mcl-package}/**/*.class" />
+ <include name="META-INF/services/java.sql.Driver" />
</fileset>
</jar>
</target>
@@ -125,6 +127,7 @@ Copyright 2008-2015 MonetDB B.V.
<include name="${mcl-package}/**/*.class" />
<include name="${client-package}/**/*.class" />
<include name="${util-package}/**/*.class" />
+ <include name="META-INF/services/java.sql.Driver" />
</fileset>
<manifest>
<attribute name="Built-By" value="${user.name}" />
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
@@ -1,11 +1,11 @@
stderr of test 'rapi01` in directory 'monetdb5/extras/rapi` itself:
-# 16:45:15 >
-# 16:45:15 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33997" "--set"
"mapi_usock=/var/tmp/mtest-95437/.s.monetdb.33997" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/hannes/monetdb-rint-install/var/MonetDB/mTests_monetdb5_extras_rapi"
"--set" "mal_listing=2" "--set" "embedded_r=yes"
-# 16:45:15 >
+# 11:17:46 >
+# 11:17:46 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31221" "--set"
"mapi_usock=/var/tmp/mtest-13991/.s.monetdb.31221" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/hannes/monetdb-install/var/MonetDB/mTests_monetdb5_extras_rapi"
"--set" "mal_listing=2" "--set" "embedded_r=yes"
+# 11:17:46 >
-# builtin opt gdk_dbpath =
/Users/hannes/monetdb-rint-install/var/monetdb5/dbfarm/demo
+# builtin opt gdk_dbpath =
/Users/hannes/monetdb-install/var/monetdb5/dbfarm/demo
# builtin opt gdk_debug = 0
# builtin opt gdk_vmtrim = no
# builtin opt monet_prompt = >
@@ -17,44 +17,39 @@ stderr of test 'rapi01` in directory 'mo
# builtin opt sql_debug = 0
# cmdline opt gdk_nr_threads = 0
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 33997
-# cmdline opt mapi_usock = /var/tmp/mtest-95437/.s.monetdb.33997
+# cmdline opt mapi_port = 31221
+# cmdline opt mapi_usock = /var/tmp/mtest-13991/.s.monetdb.31221
# cmdline opt monet_prompt =
# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/Users/hannes/monetdb-rint-install/var/MonetDB/mTests_monetdb5_extras_rapi
+# cmdline opt gdk_dbpath =
/Users/hannes/monetdb-install/var/MonetDB/mTests_monetdb5_extras_rapi
# cmdline opt mal_listing = 2
# cmdline opt embedded_r = yes
# cmdline opt gdk_debug = 536870922
-# 16:45:15 >
-# 16:45:15 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-95437" "--port=33997"
-# 16:45:15 >
+# 11:17:47 >
+# 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-4656/.s.monetdb.33963
+MAPI = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221
QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <-
Re(fft(somevalue));",b);
-ERROR = !MALException:rapi.eval:Error running R expression. Error message:
Error in fft(somevalue) : object 'somevalue' not found
- !Calls: as.data.frame -> <Anonymous> -> fft
-MAPI = (monetdb) /var/tmp/mtest-4656/.s.monetdb.33963
+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 message:
Error in fft(arg2) : object 'arg2' not found
- !Calls: as.data.frame -> <Anonymous> -> fft
-MAPI = (monetdb) /var/tmp/mtest-4656/.s.monetdb.33963
+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 message:
Error in fft(somevalue) : object 'somevalue' not found
- !Calls: as.data.frame -> <Anonymous> -> fft
-MAPI = (monetdb) /var/tmp/mtest-4656/.s.monetdb.33963
+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 message:
Error in fft(arg2) : object 'arg2' not found
- !Calls: as.data.frame -> <Anonymous> -> fft
-MAPI = (monetdb) /var/tmp/mtest-4656/.s.monetdb.33963
+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 message:
Error in fft(arg5) : object 'arg5' not found
- !Calls: as.data.frame -> <Anonymous> -> fft
-MAPI = (monetdb) /var/tmp/mtest-4656/.s.monetdb.33963
+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) ) );'.
-# 16:45:16 >
-# 16:45:16 > "Done."
-# 16:45:16 >
+# 11:17:47 >
+# 11:17:47 > "Done."
+# 11:17:47 >
diff --git a/sql/backends/monet5/Tests/rapi09.stable.err
b/sql/backends/monet5/Tests/rapi09.stable.err
--- a/sql/backends/monet5/Tests/rapi09.stable.err
+++ b/sql/backends/monet5/Tests/rapi09.stable.err
@@ -1,11 +1,11 @@
stderr of test 'rapi09` in directory 'sql/backends/monet5` itself:
-# 11:14:59 >
-# 11:14:59 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36576" "--set"
"mapi_usock=/var/tmp/mtest-9729/.s.monetdb.36576" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch2/hannes/monetdb-rint-install/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
-# 11:14:59 >
+# 11:20:45 >
+# 11:20:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36531" "--set"
"mapi_usock=/var/tmp/mtest-14205/.s.monetdb.36531" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/hannes/monetdb-install/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 11:20:45 >
-# builtin opt gdk_dbpath =
/export/scratch2/hannes/monetdb-rint-install/var/monetdb5/dbfarm/demo
+# builtin opt gdk_dbpath =
/Users/hannes/monetdb-install/var/monetdb5/dbfarm/demo
# builtin opt gdk_debug = 0
# builtin opt gdk_vmtrim = no
# builtin opt monet_prompt = >
@@ -17,43 +17,36 @@ stderr of test 'rapi09` in directory 'sq
# builtin opt sql_debug = 0
# cmdline opt gdk_nr_threads = 0
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 36576
-# cmdline opt mapi_usock = /var/tmp/mtest-9729/.s.monetdb.36576
+# cmdline opt mapi_port = 36531
+# cmdline opt mapi_usock = /var/tmp/mtest-14205/.s.monetdb.36531
# cmdline opt monet_prompt =
# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/export/scratch2/hannes/monetdb-rint-install/var/MonetDB/mTests_sql_backends_monet5
+# cmdline opt gdk_dbpath =
/Users/hannes/monetdb-install/var/MonetDB/mTests_sql_backends_monet5
# cmdline opt mal_listing = 0
# cmdline opt embedded_r = yes
# cmdline opt gdk_debug = 536870922
-# 11:15:00 >
-# 11:15:00 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9729" "--port=36576"
-# 11:15:00 >
+# 11:20:46 >
+# 11:20:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-14205" "--port=36531"
+# 11:20:46 >
-MAPI = (monetdb) /var/tmp/mtest-9729/.s.monetdb.36576
+MAPI = (monetdb) /var/tmp/mtest-14205/.s.monetdb.36531
QUERY = SELECT * FROM shouldbeint();
ERROR = !wrong R column type for column 0, expected INTeger, got REAL.
-MAPI = (monetdb) /var/tmp/mtest-9729/.s.monetdb.36576
+MAPI = (monetdb) /var/tmp/mtest-14205/.s.monetdb.36531
QUERY = SELECT * FROM throwerror();
-ERROR = !Error running R expression. Error message: Error in (function() { :
goodbye cruel world
- !Calls: as.data.frame -> <Anonymous>
-MAPI = (monetdb) /var/tmp/mtest-9729/.s.monetdb.36576
+ERROR = !Error running R expression: Error in (function() { : goodbye cruel
world Calls: as.data.frame -> <Anonymous>
+MAPI = (monetdb) /var/tmp/mtest-14205/.s.monetdb.36531
QUERY = SELECT * FROM suicide();
-ERROR = !Error running R expression. Error message: Error in quit(save = "no")
:
- ! We do not want to call q(uit), it would exit MonetDB, too. You
probably want to exit the R context, so I am calling stop() instead.
- !Calls: as.data.frame -> <Anonymous> -> quit
-MAPI = (monetdb) /var/tmp/mtest-9729/.s.monetdb.36576
+ERROR = !Error running R expression: Error in quit(save = "no") : We do not
want to call q(uit), it would exit MonetDB, too. You probably want to exit the
R context, so I am calling stop() instead. Calls: as.data.frame -> <Anonymous>
-> quit
+MAPI = (monetdb) /var/tmp/mtest-14205/.s.monetdb.36531
QUERY = SELECT * FROM suicide2();
-ERROR = !Error running R expression. Error message: Error in base::quit(save =
"no") :
- ! We do not want to call q(uit), it would exit MonetDB, too. You
probably want to exit the R context, so I am calling stop() instead.
- !Calls: as.data.frame -> <Anonymous> -> <Anonymous>
-MAPI = (monetdb) /var/tmp/mtest-9729/.s.monetdb.36576
+ERROR = !Error running R expression: Error in base::quit(save = "no") : We
do not want to call q(uit), it would exit MonetDB, too. You probably want to
exit the R context, so I am calling stop() instead. Calls: as.data.frame ->
<Anonymous> -> <Anonymous>
+MAPI = (monetdb) /var/tmp/mtest-14205/.s.monetdb.36531
QUERY = SELECT * FROM suicide3();
-ERROR = !Error running R expression. Error message: Error in
.Internal(quit("no", 0, F)) :
- ! there is no .Internal function 'quit'
- !Calls: as.data.frame -> <Anonymous>
+ERROR = !Error running R expression: Error in .Internal(quit("no", 0, F)) :
there is no .Internal function 'quit' Calls: as.data.frame -> <Anonymous>
-# 11:15:00 >
-# 11:15:00 > "Done."
-# 11:15:00 >
+# 11:20:46 >
+# 11:20:46 > "Done."
+# 11:20:46 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
