Changeset: 4d87c8e6ce78 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4d87c8e6ce78
Modified Files:
monetdb5/modules/mal/Tests/remote05.mal
monetdb5/modules/mal/Tests/remote05.stable.err
monetdb5/modules/mal/Tests/remote05.stable.out
monetdb5/modules/mal/remote.c
sql/backends/monet5/sql.mx
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 2202 to 300 lines):
diff --git a/monetdb5/modules/mal/Tests/All b/monetdb5/modules/mal/Tests/All
--- a/monetdb5/modules/mal/Tests/All
+++ b/monetdb5/modules/mal/Tests/All
@@ -32,6 +32,7 @@
remote03
remote04
remote06
+remote08
# needs Merovingian and aims at SQL
#remote88
#remote89
diff --git a/monetdb5/modules/mal/Tests/remote05.mal
b/monetdb5/modules/mal/Tests/remote05.mal
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/remote05.mal
+++ /dev/null
@@ -1,23 +0,0 @@
-# let connect figure out itself how to connect to the running db
-uri := sabaoth.getLocalConnectionURI();
-conn:str := remote.connect(uri, "monetdb", "monetdb");
-
-# nasty, do multi result stuff with exec
-(list, kind) := remote.exec(conn, "remote", "getList");
-
-listb:bat[:oid,:str] := remote.get(conn, list);
-kindb:bat[:oid,:str] := remote.get(conn, kind);
-
-io.print("list");
-io.print(listb);
-io.print("kind");
-io.print(kindb);
-
-(listb, kindb) := remote.getList();
-
-io.print("list");
-io.print(listb);
-io.print("kind");
-io.print(kindb);
-
-remote.disconnect(conn);
diff --git a/monetdb5/modules/mal/Tests/remote05.stable.err
b/monetdb5/modules/mal/Tests/remote05.stable.err
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/remote05.stable.err
+++ /dev/null
@@ -1,81 +0,0 @@
-stderr of test 'remote05` in directory 'modules/mal` itself:
-
-
-# 21:34:57 >
-# 21:34:57 > mserver5
"--config=/export/scratch/stripe/fabian/monetdb/current/program-i86pc/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5:/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5/lib:/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/export/scratch/stripe/fabian/monetdb/current/mtest-pegasus/five/dbfarm"
--set
"sql_logdir=/export/scratch/stripe/fabian/monetdb/current/mtest-pegasus/five/sqllog"
--set
"xquery_logdir=/export/scratch/stripe/fabian/monetdb/current/mtest-pegasus/five/xquerylog"
--set mapi_open=true --set xrpc_open=true --set mapi_port=39485 --set
xrpc_port=42803 --set monet_prompt= --trace --dbname=mTests_src_modules_mal
remote05.mal
-# 21:34:57 >
-
-# builtin opt gdk_arch = 64bitx86_64-pc-solaris2.11
-# builtin opt gdk_version = 1.27.0
-# builtin opt monet_pid = 25637
-# builtin opt prefix =
/export/scratch/stripe/fabian/monetdb/current/program-i86pc
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = tst
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt gdk_debug = 8
-# builtin opt gdk_mem_bigsize = 262144
-# builtin opt gdk_alloc_map = yes
-# builtin opt gdk_mem_pagebits = 14
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path =
/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB:/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/bin
-# builtin opt monet_daemon = yes
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_noheaders = no
-# builtin opt mapi_debug = 0
-# builtin opt mapi_clients = 2
-# builtin opt sql_debug = 0
-# builtin opt sql_logdir = ${prefix}/var/MonetDB
-# builtin opt xquery_logdir = ${prefix}/var/MonetDB
-# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix =
/export/scratch/stripe/fabian/monetdb/current/program-i86pc
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix =
/export/scratch/stripe/fabian/monetdb/current/program-i86pc
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt gdk_dbname = demo
-# config opt gdk_alloc_map = no
-# config opt gdk_embedded = no
-# config opt gdk_debug = 0
-# config opt monet_mod_path =
/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5:/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5/lib:/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/merovingian.log
-# config opt mero_timeinterval = 600
-# config opt mero_pidfile = ${prefix}/var/run/merovingian.pid
-# config opt mero_exittimeout = 7
-# config opt mero_doproxy = yes
-# config opt mero_discoveryttl = 600
-# config opt mal_init =
/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5/mal_init.mal
-# config opt mal_listing = 2
-# config opt checkpoint_dir = ${prefix}/var/MonetDB5/chkpnt
-# config opt mapi_port = 50000
-# config opt mapi_open = false
-# config opt sql_logdir = ${prefix}/var/MonetDB5/sql_logs
-# config opt sql_init =
/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5/sql_init.sql
-# cmdline opt config =
/export/scratch/stripe/fabian/monetdb/current/program-i86pc/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5:/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5/lib:/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/export/scratch/stripe/fabian/monetdb/current/mtest-pegasus/five/dbfarm
-# cmdline opt sql_logdir =
/export/scratch/stripe/fabian/monetdb/current/mtest-pegasus/five/sqllog
-# cmdline opt xquery_logdir =
/export/scratch/stripe/fabian/monetdb/current/mtest-pegasus/five/xquerylog
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 39485
-# cmdline opt xrpc_port = 42803
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_modules_mal
-# cmdline opt gdk_debug = 10
-#warning: please don't forget to set your vault key!
-#(see
/export/scratch/stripe/fabian/monetdb/current/program-i86pc/etc/monetdb5.conf)
-
-# 21:34:57 >
-# 21:34:57 > Done.
-# 21:34:57 >
-
diff --git a/monetdb5/modules/mal/Tests/remote05.stable.out
b/monetdb5/modules/mal/Tests/remote05.stable.out
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/remote05.stable.out
+++ /dev/null
@@ -1,130 +0,0 @@
-stdout of test 'remote05` in directory 'modules/mal` itself:
-
-
-# 21:34:57 >
-# 21:34:57 > mserver5
"--config=/export/scratch/stripe/fabian/monetdb/current/program-i86pc/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5:/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5/lib:/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/export/scratch/stripe/fabian/monetdb/current/mtest-pegasus/five/dbfarm"
--set
"sql_logdir=/export/scratch/stripe/fabian/monetdb/current/mtest-pegasus/five/sqllog"
--set
"xquery_logdir=/export/scratch/stripe/fabian/monetdb/current/mtest-pegasus/five/xquerylog"
--set mapi_open=true --set xrpc_open=true --set mapi_port=39485 --set
xrpc_port=42803 --set monet_prompt= --trace --dbname=mTests_src_modules_mal
remote05.mal
-# 21:34:57 >
-
-# MonetDB server v5.9.0, based on kernel v1.27.0
-# Serving database 'mTests_src_modules_mal', using 1 thread
-# Compiled for x86_64-pc-solaris2.11/64bit with 64bit OIDs dynamically linked
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008- MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://pegasus:39485/
-function user.main():void;
-# let connect figure out itself how to connect to the running db
- db := const.take("dbname");
- conn := remote.connect(db,"monetdb","monetdb");
-# nasty, do multi result stuff with exec
- (list,kind) := remote.exec(conn,"remote","getList");
- listb := remote.get(conn,list);
- kindb := remote.get(conn,kind);
- io.print("list");
- io.print(listb);
- io.print("kind");
- io.print(kindb);
- (listb,kindb) := remote.getList();
- io.print("list");
- io.print(listb);
- io.print("kind");
- io.print(kindb);
- remote.disconnect(conn);
-end main;
-[ "list" ]
-#-------------------------------------------------#
-# h t # name
-# oid str # type
-#-------------------------------------------------#
-[ 0@0, "mTests_tests_BugTracker" ]
-[ 1@0, "mTests_tests_BugReports" ]
-[ 2@0, "mTests" ]
-[ 3@0, "mTests_src_tools" ]
-[ 4@0, "mTests_tests_mapi" ]
-[ 5@0, "mTests_tests_gdkTests" ]
-[ 6@0, "mTests_src_mal" ]
-[ 7@0, "mTests_tests_suite_06" ]
-[ 8@0, "mTests_src_modules_mal" ]
-[ 9@0, "mTests_tests_suite_01" ]
-[ 10@0, "mTests_src_optimizer" ]
-[ 11@0, "mTests_tests_BugDay_2005-10-06_4.9.3" ]
-[ 12@0, "mTests_src_modules_kernel" ]
-[ 13@0, "mTests_tests_BugDay_2005-10-06_4.8" ]
-[ 14@0, "mTests_src_modules_atoms" ]
-[ 15@0, "mTests_tests_suite_00" ]
-[ 16@0, "mTests_src_scheduler" ]
-[ 17@0, "mTests_tests_BugsViaSourgeforce" ]
-[ "kind" ]
-#-------------------------#
-# h t # name
-# oid str # type
-#-------------------------#
-[ 0@0, "local" ]
-[ 1@0, "local" ]
-[ 2@0, "local" ]
-[ 3@0, "local" ]
-[ 4@0, "local" ]
-[ 5@0, "local" ]
-[ 6@0, "local" ]
-[ 7@0, "local" ]
-[ 8@0, "local" ]
-[ 9@0, "local" ]
-[ 10@0, "local" ]
-[ 11@0, "local" ]
-[ 12@0, "local" ]
-[ 13@0, "local" ]
-[ 14@0, "local" ]
-[ 15@0, "local" ]
-[ 16@0, "local" ]
-[ 17@0, "local" ]
-[ "list" ]
-#-------------------------------------------------#
-# h t # name
-# oid str # type
-#-------------------------------------------------#
-[ 0@0, "mTests_tests_BugTracker" ]
-[ 1@0, "mTests_tests_BugReports" ]
-[ 2@0, "mTests" ]
-[ 3@0, "mTests_src_tools" ]
-[ 4@0, "mTests_tests_mapi" ]
-[ 5@0, "mTests_tests_gdkTests" ]
-[ 6@0, "mTests_src_mal" ]
-[ 7@0, "mTests_tests_suite_06" ]
-[ 8@0, "mTests_src_modules_mal" ]
-[ 9@0, "mTests_tests_suite_01" ]
-[ 10@0, "mTests_src_optimizer" ]
-[ 11@0, "mTests_tests_BugDay_2005-10-06_4.9.3" ]
-[ 12@0, "mTests_src_modules_kernel" ]
-[ 13@0, "mTests_tests_BugDay_2005-10-06_4.8" ]
-[ 14@0, "mTests_src_modules_atoms" ]
-[ 15@0, "mTests_tests_suite_00" ]
-[ 16@0, "mTests_src_scheduler" ]
-[ 17@0, "mTests_tests_BugsViaSourgeforce" ]
-[ "kind" ]
-#-------------------------#
-# h t # name
-# oid str # type
-#-------------------------#
-[ 0@0, "local" ]
-[ 1@0, "local" ]
-[ 2@0, "local" ]
-[ 3@0, "local" ]
-[ 4@0, "local" ]
-[ 5@0, "local" ]
-[ 6@0, "local" ]
-[ 7@0, "local" ]
-[ 8@0, "local" ]
-[ 9@0, "local" ]
-[ 10@0, "local" ]
-[ 11@0, "local" ]
-[ 12@0, "local" ]
-[ 13@0, "local" ]
-[ 14@0, "local" ]
-[ 15@0, "local" ]
-[ 16@0, "local" ]
-[ 17@0, "local" ]
-
-# 21:34:57 >
-# 21:34:57 > Done.
-# 21:34:57 >
-
diff --git a/monetdb5/modules/mal/Tests/remote08.mal
b/monetdb5/modules/mal/Tests/remote08.mal
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/remote08.mal
@@ -0,0 +1,20 @@
+# let connect figure out itself how to connect to the running db
+uri := sabaoth.getLocalConnectionURI();
+
+# create a persistent connecton to ourself
+conn1:str := remote.connect(uri, "monetdb", "monetdb");
+
+b := bat.new(:oid, :int);
+
+b := bat.insert(b, nil:oid, 2);
+b := bat.insert(b, nil:oid, 4);
+b := algebra.markH(b);
+rb2 := remote.put(conn1, b);
+
+lb2:bat[:oid,:int] := remote.get(conn1, rb2);
+
+io.print(lb2);
+
+# help testweb a bit, since currently no cleanup is done on server
+# shutdown
+remote.disconnect(conn1);
diff --git a/monetdb5/modules/mal/Tests/remote08.stable.err
b/monetdb5/modules/mal/Tests/remote08.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/remote08.stable.err
@@ -0,0 +1,31 @@
+stderr of test 'remote08` in directory 'modules/mal` itself:
+
+
+# 13:26:30 >
+# 13:26:30 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-volund.ins.cwi.nl/five/dbfarm"
--set mapi_open=true --set mapi_port=38415 --set monet_prompt= --trace
--forcemito --set mal_listing=2 --dbname=mTests_modules_mal remote08.mal
+# 13:26:30 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/ufs/fabian/scratch/monetdb/current/program-x86_64/var/lib/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
