Changeset: be5f51e44622 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be5f51e44622
Modified Files:
monetdb5/modules/mal/Tests/remote03.stable.err
monetdb5/modules/mal/Tests/remote03.stable.out
monetdb5/optimizer/Tests/dataflow3.stable.out
monetdb5/optimizer/Tests/dataflow4.stable.out
Branch: default
Log Message:
Approve output
diffs (191 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,11 +1,11 @@
stderr of test 'remote03` in directory 'monetdb5/modules/mal` itself:
-# 13:32:04 >
-# 13:32:04 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38272" "--set"
"mapi_usock=/var/tmp/mtest-30987/.s.monetdb.38272" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/Monet-devel/var/MonetDB/mTests_monetdb5_modules_mal"
"--set" "embedded_r=yes"
-# 13:32:04 >
+# 04:04:13 >
+# 04:04:13 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32121" "--set"
"mapi_usock=/var/tmp/mtest-3168/.s.monetdb.32121" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
+# 04:04:13 >
-# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-devel/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,18 +17,17 @@ stderr of test 'remote03` in directory '
# builtin opt sql_debug = 0
# cmdline opt gdk_nr_threads = 0
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 38272
-# cmdline opt mapi_usock = /var/tmp/mtest-30987/.s.monetdb.38272
+# cmdline opt mapi_port = 32121
+# cmdline opt mapi_usock = /var/tmp/mtest-3168/.s.monetdb.32121
# cmdline opt monet_prompt =
-# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-devel/var/MonetDB/mTests_monetdb5_modules_mal
-# cmdline opt embedded_r = yes
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_modules_mal
# cmdline opt gdk_debug = 536870922
-# 13:32:05 >
-# 13:32:05 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-30987" "--port=38272"
-# 13:32:05 >
+# 04:04:13 >
+# 04:04:13 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-3168" "--port=32121"
+# 04:04:13 >
-MAPI = (monetdb) /var/tmp/mtest-30987/.s.monetdb.38272
+MAPI = (monetdb) /var/tmp/mtest-3168/.s.monetdb.32121
QUERY = # let connect figure out itself how to connect to the running db
uri := sabaoth.getLocalConnectionURI();
conn:str := remote.connect(uri, "monetdb", "monetdb");
@@ -94,10 +93,9 @@ QUERY = # let connect figure out itself
io.print("Received an error from the remote site");
exit MALException;
+ERROR =
!SyntaxException:remote.exec:(mapi:monetdb://mone...@vienna.da.cwi.nl/mTests_monetdb5_modules_mal)
rmt0_X_0_void := io.print.bla();
+# 04:04:13 >
+# 04:04:13 > "Done."
+# 04:04:13 >
-
-# 23:12:09 >
-# 23:12:09 > "Done."
-# 23:12:09 >
-
diff --git a/monetdb5/modules/mal/Tests/remote03.stable.out
b/monetdb5/modules/mal/Tests/remote03.stable.out
--- a/monetdb5/modules/mal/Tests/remote03.stable.out
+++ b/monetdb5/modules/mal/Tests/remote03.stable.out
@@ -1,34 +1,32 @@
stdout of test 'remote03` in directory 'monetdb5/modules/mal` itself:
-# 22:17:31 >
-# 22:17:31 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30468" "--set"
"mapi_usock=/var/tmp/mtest-3813/.s.monetdb.30468" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
"remote03.mal"
-# 22:17:31 >
+# 04:04:13 >
+# 04:04:13 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32121" "--set"
"mapi_usock=/var/tmp/mtest-3168/.s.monetdb.32121" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
+# 04:04:13 >
-# MonetDB 5 server v11.18.0
+# MonetDB 5 server v11.24.0
# This is an unreleased version
# Serving database 'mTests_monetdb5_modules_mal', 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
+# Copyright (c) August 2008-2016 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:30468/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-3813/.s.monetdb.30468
+# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:32121/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-3168/.s.monetdb.32121
# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
# MonetDB/SQL module loaded
-# MonetDB/R module loaded
Ready.
-# 23:12:08 >
-# 23:12:08 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-23626" "--port=30565"
-# 23:12:08 >
+# 04:04:13 >
+# 04:04:13 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-3168" "--port=32121"
+# 04:04:13 >
[ "Received first error from the remote site" ]
-# 22:17:31 >
-# 22:17:31 > "Done."
-# 22:17:31 >
+# 04:04:13 >
+# 04:04:13 > "Done."
+# 04:04:13 >
diff --git a/monetdb5/optimizer/Tests/dataflow3.stable.out
b/monetdb5/optimizer/Tests/dataflow3.stable.out
--- a/monetdb5/optimizer/Tests/dataflow3.stable.out
+++ b/monetdb5/optimizer/Tests/dataflow3.stable.out
@@ -26,13 +26,13 @@ Ready.
#mdb.list("user","s1_0");
function user.s1_0():void;
-barrier X_52 := language.dataflow();
+barrier X_31 := language.dataflow();
X17 := bat.new(:lng);
X54 := bat.new(:lng);
X55 := bat.new(:lng);
X56 := bat.new(:lng);
X57 := bat.new(:lng);
-exit X_52;
+exit X_31;
X59 :=
remote.connect("mapi:monetdb://volund.ins.cwi.nl:50000/sn4","monetdb","monetdb","msql");
remote.register(X59,"user","s1_0map");
X66 := remote.put(X59,X54);
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,43 +28,43 @@ Ready.
#mdb.list("user","tst");
function user.tst():void;
-barrier X_18 := language.dataflow();
+barrier X_12 := language.dataflow();
i := 1;
b := bat.new(:int);
a := bat.new(:int);
-exit X_18;
-barrier X_21 := language.dataflow();
+exit X_12;
+barrier X_15 := language.dataflow();
i := 2;
b := bat.new(:int);
c := bat.new(:int);
a := bat.new(:int);
-exit X_21;
-barrier X_24 := language.dataflow();
+exit X_15;
+barrier X_18 := language.dataflow();
c := bat.new(:int);
a := bat.new(:int);
d := bat.new(:int);
-exit X_24;
+exit X_18;
io.print(a);
io.print(d);
end user.tst;
#mdb.list("user","tst");
function user.tst():void;
-barrier X_18 := language.dataflow();
+barrier X_12 := language.dataflow();
i := 1;
b := bat.new(:int);
a := bat.new(:int);
-exit X_18;
-barrier X_21 := language.dataflow();
+exit X_12;
+barrier X_15 := language.dataflow();
i := 2;
b := bat.new(:int);
c := bat.new(:int);
a := bat.new(:int);
-exit X_21;
-barrier X_24 := language.dataflow();
+exit X_15;
+barrier X_18 := language.dataflow();
c := bat.new(:int);
a := bat.new(:int);
d := bat.new(:int);
-exit X_24;
+exit X_18;
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
