Changeset: bc99ac396d18 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bc99ac396d18
Modified Files:
monetdb5/modules/mal/Tests/remote03.stable.err
monetdb5/modules/mal/Tests/remote03.stable.out.int128
monetdb5/optimizer/Tests/dataflow4.stable.out
Branch: default
Log Message:
Approve output
diffs (247 lines):
diff --git a/monetdb5/modules/mal/Tests/remote03.stable.err
b/monetdb5/modules/mal/Tests/remote03.stable.err
--- a/monetdb5/modules/mal/Tests/remote03.stable.err
+++ b/monetdb5/modules/mal/Tests/remote03.stable.err
@@ -1,14 +1,96 @@
stderr of test 'remote03` in directory 'monetdb5/modules/mal` itself:
-# 15:28:56 >
-# 15:28:56 > Mtimeout -timeout 60 mserver5
"--config=/ufs/fabian/scratch/monetdb/current/program-x86_64/etc/monetdb5.conf"
--debug=10 --set
"monet_mod_path=/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5/lib:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/five/dbfarm"
--set
"sql_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/five/sqllog"
--set
"xquery_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/five/xquerylog"
--set mapi_open=true --set mapi_port=34439 --set xrpc_port=43409 --set
monet_prompt= --trace --dbname=mTests_src_modules_mal remote03.mal
-# 15:28:56 >
+# 23:12:08 >
+# 23:12:08 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30565" "--set"
"mapi_usock=/var/tmp/mtest-23626/.s.monetdb.30565" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
"--set" "mal_listing=2" "--set" "embedded_r=yes"
+# 23:12:08 >
-#warning: please don't forget to set your vault key!
-#(see /ufs/fabian/scratch/monetdb/current/program-x86_64/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 = 30565
+# cmdline opt mapi_usock = /var/tmp/mtest-23626/.s.monetdb.30565
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_modules_mal
+# cmdline opt mal_listing = 2
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
-# 15:28:56 >
-# 15:28:56 > Done.
-# 15:28:56 >
+# 23:12:08 >
+# 23:12:08 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-23626" "--port=30565"
+# 23:12:08 >
+MAPI = (monetdb) /var/tmp/mtest-23626/.s.monetdb.30565
+QUERY = # let connect figure out itself how to connect to the running db
+ uri := sabaoth.getLocalConnectionURI();
+ conn:str := remote.connect(uri, "monetdb", "monetdb");
+
+ # this is invalid, as io.print is an invalid module, and bla will be
+ # taken as function
+ res:str := remote.put(conn,:void);
+ res := remote.exec(conn, "io.print", "bla");
+ catch SyntaxException:str;
+ io.print("Received first error from the remote site");
+ io.printf("!%s\n", SyntaxException);
+ exit SyntaxException;
+
+ # now do it with a function that returns something (a BAT in this case)
+ bn:= bat.new(:oid,:str);
+ b := remote.put(conn,bn);
+ catch MALException:str;
+ io.print("Received second init error from the remote site");
+ io.printf("!%s\n", MALException);
+ exit MALException;
+ io.print(b);
+ b := remote.exec(conn, "inspect", "getAtomNames");
+ catch MALException:str;
+ io.print("Received second error from the remote site");
+ io.printf("!%s\n", MALException);
+ exit MALException;
+ io.print(b);
+
+ c:bat[:oid,:str] := remote.get(conn, b);
+ io.print(c);
+ catch MALException:str;
+ io.print("Received third error from the remote site");
+ io.printf("!%s\n", MALException);
+ exit MALException;
+
+ # io.print only outputs things, but returns nothing
+ ah:str := remote.put(conn,:void);
+ io.print(ah);
+ ah:str := remote.exec(conn, "io", "print", b);
+ catch MALException:str;
+ io.print("Received fourth error from the remote site");
+ io.printf("!%s\n", MALException);
+ exit MALException;
+
+ d:void := remote.get(conn, ah);
+ io.print(d);
+ catch MALException:str;
+ io.print("Received fifth error from the remote site");
+ io.printf("!%s\n", MALException);
+ exit MALException;
+
+ # help testweb a bit, since currently no cleanup is done on server
+ # shutdown
+ remote.disconnect(conn);
+ERROR =
!SyntaxException:remote.exec:(mapi:monetdb://mone...@vienna.da.cwi.nl/mTests_monetdb5_modules_mal)
rmt0_X_9_void := io.print.bla();
+
+
+
+
+# 23:12:09 >
+# 23:12:09 > "Done."
+# 23:12:09 >
+
diff --git a/monetdb5/modules/mal/Tests/remote03.stable.out.int128
b/monetdb5/modules/mal/Tests/remote03.stable.out.int128
--- a/monetdb5/modules/mal/Tests/remote03.stable.out.int128
+++ b/monetdb5/modules/mal/Tests/remote03.stable.out.int128
@@ -18,101 +18,15 @@ stdout of test 'remote03` in directory '
# MonetDB/GIS module loaded
# MonetDB/JAQL module loaded
# MonetDB/SQL module loaded
-function user.main():void;
-# let connect figure out itself how to connect to the running db
- uri := sabaoth.getLocalConnectionURI();
- conn:str := remote.connect(uri,"monetdb","monetdb");
-# this is invalid, as io.print is an invalid module, and bla will be
-# taken as function
- res:str := remote.put(conn,:void);
- res:str := remote.exec(conn,"io.print","bla");
-catch SyntaxException:str;
- io.print("Received first error from the remote site");
- io.printf("!%s\n",SyntaxException);
-exit SyntaxException:str;
-# now do it with a function that returns something (a BAT in this case)
- bn := bat.new(:oid,:str);
- b := remote.put(conn,bn);
-catch MALException:str;
- io.print("Received second init error from the remote site");
- io.printf("!%s\n",MALException);
-exit MALException:str;
- io.print(b);
- b := remote.exec(conn,"inspect","getAtomNames");
-catch MALException:str;
- io.print("Received second error from the remote site");
- io.printf("!%s\n",MALException);
-exit MALException:str;
- io.print(b);
- c:bat[:oid,:str] := remote.get(conn,b);
- io.print(c);
-catch MALException:str;
- io.print("Received third error from the remote site");
- io.printf("!%s\n",MALException);
-exit MALException:str;
-# io.print only outputs things, but returns nothing
- ah:str := remote.put(conn,:void);
- io.print(ah);
- ah:str := remote.exec(conn,"io","print",b);
-catch MALException:str;
- io.print("Received fourth error from the remote site");
- io.printf("!%s\n",MALException);
-exit MALException:str;
- d:void := remote.get(conn,ah);
- io.print(d);
-catch MALException:str;
- io.print("Received fifth error from the remote site");
- io.printf("!%s\n",MALException);
-exit MALException:str;
-# help testweb a bit, since currently no cleanup is done on server
-# shutdown
- remote.disconnect(conn);
-end user.main;
-[ "Received first error from the remote site" ]
-!SyntaxException:remote.exec:(mapi:monetdb://mone...@vienna.ins.cwi.nl/mTests_monetdb5_modules_mal)
rmt0_X_9_void := io.print.bla();
-SyntaxException:parseError: ^'(' expected
+# MonetDB/R module loaded
-[ "rmt1_bn_bat_oid_str" ]
-[ "rmt1_bn_bat_oid_str" ]
-#--------------------------#
-# h t # name
-# void str # type
-#--------------------------#
-[ 0@0, "void" ]
-[ 1@0, "bit" ]
-[ 2@0, "bte" ]
-[ 3@0, "sht" ]
-[ 4@0, "BAT" ]
-[ 5@0, "int" ]
-[ 6@0, "oid" ]
-[ 7@0, "wrd" ]
-[ 8@0, "ptr" ]
-[ 9@0, "flt" ]
-[ 10@0, "dbl" ]
-[ 11@0, "lng" ]
-[ 12@0, "hge" ]
-[ 13@0, "str" ]
-[ 14@0, "streams" ]
-[ 15@0, "bstream" ]
-[ 16@0, "blob" ]
-[ 17@0, "sqlblob" ]
-[ 18@0, "color" ]
-[ 19@0, "url" ]
-[ 20@0, "uuid" ]
-[ 21@0, "json" ]
-[ 22@0, "date" ]
-[ 23@0, "daytime" ]
-[ 24@0, "timestamp" ]
-[ 25@0, "timezone" ]
-[ 26@0, "zrule" ]
-[ 27@0, "inet" ]
-[ 28@0, "identifier" ]
-[ 29@0, "xml" ]
-[ 30@0, "pcre" ]
-[ 31@0, "mbr" ]
-[ 32@0, "wkb" ]
-[ "rmt2_X_9_void" ]
-[ nil ]
+Ready.
+
+# 23:12:08 >
+# 23:12:08 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-23626" "--port=30565"
+# 23:12:08 >
+
+[ "Received first error from the remote site" ]
# 22:17:31 >
# 22:17:31 > "Done."
diff --git a/monetdb5/optimizer/Tests/dataflow4.stable.out
b/monetdb5/optimizer/Tests/dataflow4.stable.out
--- a/monetdb5/optimizer/Tests/dataflow4.stable.out
+++ b/monetdb5/optimizer/Tests/dataflow4.stable.out
@@ -28,16 +28,22 @@ Ready.
#mdb.list("user","tst");
function user.tst():void;
+barrier X_19 := language.dataflow();
i := 1;
b := bat.new(:oid,:int);
a := bat.new(:oid,:int);
+exit X_19;
+barrier X_22 := language.dataflow();
i := 2;
b := bat.new(:oid,:int);
c := bat.new(:oid,:int);
a := bat.new(:oid,:int);
+exit X_22;
+barrier X_25 := language.dataflow();
c := bat.new(:oid,:int);
a := bat.new(:oid,:int);
d := bat.new(:oid,:int);
+exit X_25;
io.print(a);
io.print(d);
end user.tst;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
