Changeset: a88463ae563f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a88463ae563f
Added Files:
sql/test/remote/Tests/ssbm.stable.err
sql/test/remote/Tests/ssbm.stable.out
Modified Files:
monetdb5/modules/mal/remote.c
Branch: default
Log Message:
rollforward from Oct2014
diffs (250 lines):
diff --git a/monetdb5/modules/mal/remote.c b/monetdb5/modules/mal/remote.c
--- a/monetdb5/modules/mal/remote.c
+++ b/monetdb5/modules/mal/remote.c
@@ -74,8 +74,8 @@ static unsigned char localtype = 0;
static inline str RMTquery(MapiHdl *ret, str func, Mapi conn, str query);
static inline str RMTinternalcopyfrom(BAT **ret, char *hdr, stream *in);
-#define newColumn(Var,Type,Tag)
\
- Var = BATnew(TYPE_void, Type, 0, TRANSIENT); \
+#define newColumn(Var,Type,sz,Tag)
\
+ Var = BATnew(TYPE_void, Type, sz, TRANSIENT); \
if ( Var == NULL) throw(MAL,Tag,MAL_MALLOC_FAIL); \
BATseqbase(Var,0);
@@ -104,7 +104,7 @@ str RMTresolve(bat *ret, str *pat) {
throw(MAL, "remote.resolve", "this function needs the mserver "
"have been started by merovingian");
- newColumn(list, TYPE_str, "remote.resolve");
+ newColumn(list, TYPE_str, 0, "remote.resolve");
/* extract port from mero_uri, let mapi figure out the rest */
mero_uri+=strlen("mapi:monetdb://");
@@ -523,7 +523,7 @@ str RMTget(Client cntxt, MalBlkPtr mb, M
return var;
}
t = getColumnType(rtype);
- newColumn(b,t,"remote.get");
+ newColumn(b, t, 0, "remote.get");
if (ATOMvarsized(t)) {
while (mapi_fetch_row(mhdl)) {
@@ -954,17 +954,14 @@ str RMTbatload(Client cntxt, MalBlkPtr m
int s;
BAT *b;
size_t len;
- //size_t pos;
char *var;
- //bit escaped = 0, instr = 0;
bstream *fdin = cntxt->fdin;
v = &stk->stk[pci->argv[0]]; /* return */
t = getArgType(mb, pci, 1); /* tail type */
size = *getArgReference_int(stk, pci, 2); /* size */
- newColumn(b,t,"remote.load");
- BATextend(b,size);
+ newColumn(b, t, size, "remote.load");
/* grab the input stream and start reading */
fdin->eof = 0;
@@ -1168,7 +1165,7 @@ RMTinternalcopyfrom(BAT **ret, char *hdr
hdr++;
}
- newColumn(b, bb.Ttype,"remote.get");
+ newColumn(b, bb.Ttype, bb.size, "remote.get");
/* for strings, the width may not match, fix it to match what we
* retrieved */
diff --git a/sql/test/remote/Tests/ssbm.stable.err
b/sql/test/remote/Tests/ssbm.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/remote/Tests/ssbm.stable.err
@@ -0,0 +1,145 @@
+stderr of test 'ssbm` in directory 'sql/test/remote` itself:
+
+
+# 20:00:45 >
+# 20:00:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39185" "--set"
"mapi_usock=/var/tmp/mtest-22712/.s.monetdb.39185" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_remote"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 20:00:45 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/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 = 39185
+# cmdline opt mapi_usock = /var/tmp/mtest-22712/.s.monetdb.39185
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_remote
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 20:00:45 >
+# 20:00:45 > "/usr/bin/python2" "ssbm.SQL.py" "ssbm"
+# 20:00:45 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/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_usock = /var/tmp/mtest-22712/.s.monetdb.39185
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt mapi_port = 40104
+# cmdline opt gdk_dbpath = /tmp/remotetest/master/master
+# cmdline opt gdk_debug = 536870922
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/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_usock = /var/tmp/mtest-22712/.s.monetdb.39185
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt mapi_port = 42638
+# cmdline opt gdk_dbpath = /tmp/remotetest/worker_0/worker_0
+# cmdline opt gdk_debug = 536870922
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/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_usock = /var/tmp/mtest-22712/.s.monetdb.39185
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt mapi_port = 45795
+# cmdline opt gdk_dbpath = /tmp/remotetest/worker_1/worker_1
+# cmdline opt gdk_debug = 536870922
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/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_usock = /var/tmp/mtest-22712/.s.monetdb.39185
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt mapi_port = 45996
+# cmdline opt gdk_dbpath = /tmp/remotetest/worker_2/worker_2
+# cmdline opt gdk_debug = 536870922
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/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_usock = /var/tmp/mtest-22712/.s.monetdb.39185
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt mapi_port = 40068
+# cmdline opt gdk_dbpath = /tmp/remotetest/worker_3/worker_3
+# cmdline opt gdk_debug = 536870922
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/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_usock = /var/tmp/mtest-22712/.s.monetdb.39185
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt mapi_port = 33166
+# cmdline opt gdk_dbpath = /tmp/remotetest/worker_4/worker_4
+# cmdline opt gdk_debug = 536870922
+
+# 20:00:49 >
+# 20:00:49 > "Done."
+# 20:00:49 >
+
diff --git a/sql/test/remote/Tests/ssbm.stable.out
b/sql/test/remote/Tests/ssbm.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/remote/Tests/ssbm.stable.out
@@ -0,0 +1,35 @@
+stdout of test 'ssbm` in directory 'sql/test/remote` itself:
+
+
+# 20:00:45 >
+# 20:00:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39185" "--set"
"mapi_usock=/var/tmp/mtest-22712/.s.monetdb.39185" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_remote"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 20:00:45 >
+
+# MonetDB 5 server v11.19.10
+# This is an unreleased version
+# Serving database 'mTests_sql_test_remote', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.333 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:39185/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-22712/.s.monetdb.39185
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 20:00:45 >
+# 20:00:45 > "/usr/bin/python2" "ssbm.SQL.py" "ssbm"
+# 20:00:45 >
+
+60175 rows in mergetable
+[(4199635969,)]
+[(5980941, 1994, u'MFGR#1232'), (4869251, 1994, u'MFGR#126'), (4288542, 1996,
u'MFGR#126'), (19971623, 1996, u'MFGR#1225'), (8557774, 1994, u'MFGR#1220'),
(10193031, 1993, u'MFGR#1230'), (4188998, 1997, u'MFGR#1214'), (10279155, 1993,
u'MFGR#1225'), (10529427, 1997, u'MFGR#1220'), (5551142, 1993, u'MFGR#1220'),
(9952878, 1993, u'MFGR#1226'), (11569138, 1998, u'MFGR#129'), (15392246, 1994,
u'MFGR#127'), (17777153, 1994, u'MFGR#125'), (18232285, 1997, u'MFGR#1223'),
(27850979, 1996, u'MFGR#1212'), (327046, 1997, u'MFGR#125'), (35054814, 1992,
u'MFGR#127'), (7873139, 1995, u'MFGR#125'), (7015912, 1992, u'MFGR#1219'),
(13218597, 1997, u'MFGR#127'), (6040770, 1996, u'MFGR#129'), (5316438, 1998,
u'MFGR#1233'), (21747351, 1993, u'MFGR#1223'), (6960104, 1993, u'MFGR#1236'),
(10104525, 1994, u'MFGR#1223'), (5656126, 1994, u'MFGR#129'), (22661695, 1995,
u'MFGR#1236'), (13735907, 1997, u'MFGR#1236'), (9097752, 1997, u'MFGR#1221'),
(8260673, 1995, u'MFGR#1228'), (2563912, 1992, u'MFGR#1221'), (
19530708, 1994, u'MFGR#1212'), (8295332, 1996, u'MFGR#1222'), (1382981, 1993,
u'MFGR#125'), (12137253, 1993, u'MFGR#1233'), (14117772, 1995, u'MFGR#1233'),
(16358592, 1996, u'MFGR#1240'), (1069800, 1996, u'MFGR#122'), (17227363, 1995,
u'MFGR#1240'), (17725171, 1997, u'MFGR#1212'), (3231894, 1992, u'MFGR#1240'),
(4074189, 1998, u'MFGR#1225'), (14385634, 1995, u'MFGR#128'), (4383708, 1995,
u'MFGR#129'), (2793729, 1997, u'MFGR#1225'), (5142893, 1995, u'MFGR#1239'),
(13582129, 1992, u'MFGR#1212'), (14590136, 1995, u'MFGR#1225'), (4554495, 1994,
u'MFGR#122'), (5953230, 1997, u'MFGR#122'), (733435, 1998, u'MFGR#1239'),
(10005626, 1996, u'MFGR#1232'), (4258048, 1993, u'MFGR#1240'), (18995020, 1994,
u'MFGR#121'), (7617265, 1998, u'MFGR#1224'), (3339630, 1993, u'MFGR#121'),
(10755017, 1997, u'MFGR#1240'), (16038869, 1993, u'MFGR#1218'), (9091580, 1998,
u'MFGR#1217'), (13307853, 1998, u'MFGR#1232'), (784827, 1996, u'MFGR#1218'),
(11514911, 1993, u'MFGR#1211'), (35741623, 1992, u'MFGR#1211'),
(10997176, 1994, u'MFGR#1219'), (13534131, 1996, u'MFGR#1211'), (19174753,
1997, u'MFGR#1226'), (5584069, 1994, u'MFGR#1222'), (19485508, 1998,
u'MFGR#1222'), (6003315, 1992, u'MFGR#1223'), (1919741, 1998, u'MFGR#1223'),
(5762459, 1993, u'MFGR#1224'), (7552882, 1992, u'MFGR#1230'), (18723136, 1995,
u'MFGR#1224'), (13700463, 1992, u'MFGR#1225'), (6377178, 1995, u'MFGR#1232'),
(4586682, 1994, u'MFGR#1211'), (10713992, 1994, u'MFGR#1225'), (3678145, 1993,
u'MFGR#1214'), (8052920, 1997, u'MFGR#129'), (18374286, 1996, u'MFGR#125'),
(2106877, 1994, u'MFGR#1238'), (32750117, 1996, u'MFGR#127'), (14693311, 1993,
u'MFGR#127'), (5595420, 1995, u'MFGR#1218'), (13859956, 1997, u'MFGR#1224'),
(5128426, 1997, u'MFGR#123'), (2738610, 1998, u'MFGR#1238'), (15949227, 1998,
u'MFGR#1212'), (8338345, 1995, u'MFGR#1226'), (2420150, 1992, u'MFGR#1217'),
(10434877, 1997, u'MFGR#128'), (2641607, 1992, u'MFGR#122'), (5071393, 1993,
u'MFGR#129'), (2509211, 1995, u'MFGR#1217'), (1879252, 1998, u'MFGR#1236'),
(12158316, 1996, u'MFGR#121'), (7639101, 1992, u'MFGR#129'), (15102503, 1992,
u'MFGR#128'), (7325684, 1993, u'MFGR#1217'), (10329821, 1993, u'MFGR#1239'),
(13184783, 1992, u'MFGR#1232'), (7834997, 1998, u'MFGR#1219'), (19279359, 1995,
u'MFGR#1222'), (4294668, 1993, u'MFGR#1212'), (4200351, 1995, u'MFGR#1214'),
(3651938, 1998, u'MFGR#126'), (97819, 1995, u'MFGR#1230'), (2821764, 1993,
u'MFGR#126'), (6572535, 1993, u'MFGR#1228'), (7859272, 1994, u'MFGR#1233'),
(12610793, 1992, u'MFGR#1226'), (11183976, 1996, u'MFGR#1224'), (13010765,
1994, u'MFGR#1218'), (4172057, 1997, u'MFGR#1217'), (8866362, 1997,
u'MFGR#1232'), (14223208, 1994, u'MFGR#1239'), (4613081, 1996, u'MFGR#1239'),
(10864281, 1998, u'MFGR#121'), (5135891, 1996, u'MFGR#1236'), (8122643, 1993,
u'MFGR#1213'), (9841612, 1995, u'MFGR#1219'), (8693908, 1998, u'MFGR#127'),
(26560659, 1993, u'MFGR#1219'), (1097742, 1995, u'MFGR#1211'), (8668003, 1997,
u'MFGR#1222'), (4775592, 1994, u'MFGR#1224'), (4313787, 1997, u'MFGR#121'), (260
7543, 1998, u'MFGR#1230'), (2319634, 1998, u'MFGR#1220'), (4304076, 1997,
u'MFGR#1230'), (4624540, 1995, u'MFGR#1220'), (7214844, 1992, u'MFGR#125'),
(1794201, 1994, u'MFGR#123'), (4348542, 1996, u'MFGR#1221'), (5452000, 1995,
u'MFGR#1223'), (3484096, 1993, u'MFGR#1222'), (3550796, 1994, u'MFGR#1236'),
(1799648, 1993, u'MFGR#128'), (2768015, 1998, u'MFGR#128'), (128577, 1996,
u'MFGR#128'), (15464411, 1997, u'MFGR#1211'), (15556327, 1997, u'MFGR#1219'),
(2140471, 1998, u'MFGR#1211'), (5328122, 1997, u'MFGR#1233'), (5995739, 1992,
u'MFGR#1228'), (7341274, 1998, u'MFGR#123'), (900044, 1994, u'MFGR#128'),
(2707025, 1995, u'MFGR#1213'), (1728488, 1994, u'MFGR#1213'), (8704784, 1992,
u'MFGR#1224'), (3750100, 1994, u'MFGR#1226'), (5151646, 1998, u'MFGR#1240'),
(2137125, 1997, u'MFGR#1213'), (4027318, 1994, u'MFGR#1240')]
+
+# 20:00:49 >
+# 20:00:49 > "Done."
+# 20:00:49 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
