Changeset: 144c7abe8278 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=144c7abe8278
Modified Files:
sql/test/remote/Tests/ssbm.SQL.py
sql/test/remote/Tests/ssbm.stable.out
Branch: resultset
Log Message:
Merge with default branch.
diffs (truncated from 617 to 300 lines):
diff --git a/sql/test/remote/Tests/ssbm.SQL.py
b/sql/test/remote/Tests/ssbm.SQL.py
--- a/sql/test/remote/Tests/ssbm.SQL.py
+++ b/sql/test/remote/Tests/ssbm.SQL.py
@@ -173,10 +173,15 @@ for workerrec in workers:
c.execute("select count(*) from lineorder")
print str(c.fetchall()[0][0]) + ' rows in mergetable'
-# run queries
+# run queries, use mclient so output is comparable
queries = glob.glob(os.path.join(ssbmpath, '[0-1][0-9].sql'))
queries.sort()
for q in queries:
- print os.path.basename(q).replace('.sql','')
- c.execute(codecs.open(q, 'r', encoding='utf8').read())
- print c.fetchall()
+ print '# Running Q' +os.path.basename(q).replace('.sql','')
+ mc = process.client('sql', stdin=open(q), dbname='master',
host='localhost', port=masterport, stdout=process.PIPE, stderr=process.PIPE,
log=1)
+ out, err = mc.communicate()
+ sys.stdout.write(out)
+ sys.stderr.write(err)
+ # old way
+ # c.execute(codecs.open(q, 'r', encoding='utf8').read())
+ # print c.fetchall()
diff --git a/sql/test/remote/Tests/ssbm.stable.out
b/sql/test/remote/Tests/ssbm.stable.out
--- a/sql/test/remote/Tests/ssbm.stable.out
+++ b/sql/test/remote/Tests/ssbm.stable.out
@@ -1,41 +1,556 @@
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
-60175 rows in mergetable
-01
-[(4199635969,)]
-02
-[(927530712,)]
-03
-[(213477639,)]
-04
-[(35741623, 1992, u'MFGR#1211'), (13582129, 1992, u'MFGR#1212'), (2420150,
1992, u'MFGR#1217'), (7015912, 1992, u'MFGR#1219'), (2641607, 1992,
u'MFGR#122'), (2563912, 1992, u'MFGR#1221'), (6003315, 1992, u'MFGR#1223'),
(8704784, 1992, u'MFGR#1224'), (13700463, 1992, u'MFGR#1225'), (12610793, 1992,
u'MFGR#1226'), (5995739, 1992, u'MFGR#1228'), (7552882, 1992, u'MFGR#1230'),
(13184783, 1992, u'MFGR#1232'), (3231894, 1992, u'MFGR#1240'), (7214844, 1992,
u'MFGR#125'), (35054814, 1992, u'MFGR#127'), (15102503, 1992, u'MFGR#128'),
(7639101, 1992, u'MFGR#129'), (3339630, 1993, u'MFGR#121'), (11514911, 1993,
u'MFGR#1211'), (4294668, 1993, u'MFGR#1212'), (8122643, 1993, u'MFGR#1213'),
(3678145, 1993, u'MFGR#1214'), (7325684, 1993, u'MFGR#1217'), (16038869, 1993,
u'MFGR#1218'), (26560659, 1993, u'MFGR#1219'), (5551142, 1993, u'MFGR#1220'),
(3484096, 1993, u'MFGR#1222'), (21747351, 1993, u'MFGR#1223'), (5762459, 1993,
u'MFGR#1224'), (10279155, 1993, u'MFGR#1225'), (9952878, 1993, u'MFGR#1226')
, (6572535, 1993, u'MFGR#1228'), (10193031, 1993, u'MFGR#1230'), (12137253,
1993, u'MFGR#1233'), (6960104, 1993, u'MFGR#1236'), (10329821, 1993,
u'MFGR#1239'), (4258048, 1993, u'MFGR#1240'), (1382981, 1993, u'MFGR#125'),
(2821764, 1993, u'MFGR#126'), (14693311, 1993, u'MFGR#127'), (1799648, 1993,
u'MFGR#128'), (5071393, 1993, u'MFGR#129'), (18995020, 1994, u'MFGR#121'),
(4586682, 1994, u'MFGR#1211'), (19530708, 1994, u'MFGR#1212'), (1728488, 1994,
u'MFGR#1213'), (13010765, 1994, u'MFGR#1218'), (10997176, 1994, u'MFGR#1219'),
(4554495, 1994, u'MFGR#122'), (8557774, 1994, u'MFGR#1220'), (5584069, 1994,
u'MFGR#1222'), (10104525, 1994, u'MFGR#1223'), (4775592, 1994, u'MFGR#1224'),
(10713992, 1994, u'MFGR#1225'), (3750100, 1994, u'MFGR#1226'), (1794201, 1994,
u'MFGR#123'), (5980941, 1994, u'MFGR#1232'), (7859272, 1994, u'MFGR#1233'),
(3550796, 1994, u'MFGR#1236'), (2106877, 1994, u'MFGR#1238'), (14223208, 1994,
u'MFGR#1239'), (4027318, 1994, u'MFGR#1240'), (17777153, 1994, u'MFGR#125'),
(4869251, 1994, u'MFGR#126'), (15392246, 1994, u'MFGR#127'), (900044, 1994,
u'MFGR#128'), (5656126, 1994, u'MFGR#129'), (1097742, 1995, u'MFGR#1211'),
(2707025, 1995, u'MFGR#1213'), (4200351, 1995, u'MFGR#1214'), (2509211, 1995,
u'MFGR#1217'), (5595420, 1995, u'MFGR#1218'), (9841612, 1995, u'MFGR#1219'),
(4624540, 1995, u'MFGR#1220'), (19279359, 1995, u'MFGR#1222'), (5452000, 1995,
u'MFGR#1223'), (18723136, 1995, u'MFGR#1224'), (14590136, 1995, u'MFGR#1225'),
(8338345, 1995, u'MFGR#1226'), (8260673, 1995, u'MFGR#1228'), (97819, 1995,
u'MFGR#1230'), (6377178, 1995, u'MFGR#1232'), (14117772, 1995, u'MFGR#1233'),
(22661695, 1995, u'MFGR#1236'), (5142893, 1995, u'MFGR#1239'), (17227363, 1995,
u'MFGR#1240'), (7873139, 1995, u'MFGR#125'), (14385634, 1995, u'MFGR#128'),
(4383708, 1995, u'MFGR#129'), (12158316, 1996, u'MFGR#121'), (13534131, 1996,
u'MFGR#1211'), (27850979, 1996, u'MFGR#1212'), (784827, 1996, u'MFGR#1218'),
(1069800, 1996, u'MFGR#122'), (4348542, 1996, u'MFGR#1221'), (829533
2, 1996, u'MFGR#1222'), (11183976, 1996, u'MFGR#1224'), (19971623, 1996,
u'MFGR#1225'), (10005626, 1996, u'MFGR#1232'), (5135891, 1996, u'MFGR#1236'),
(4613081, 1996, u'MFGR#1239'), (16358592, 1996, u'MFGR#1240'), (18374286, 1996,
u'MFGR#125'), (4288542, 1996, u'MFGR#126'), (32750117, 1996, u'MFGR#127'),
(128577, 1996, u'MFGR#128'), (6040770, 1996, u'MFGR#129'), (4313787, 1997,
u'MFGR#121'), (15464411, 1997, u'MFGR#1211'), (17725171, 1997, u'MFGR#1212'),
(2137125, 1997, u'MFGR#1213'), (4188998, 1997, u'MFGR#1214'), (4172057, 1997,
u'MFGR#1217'), (15556327, 1997, u'MFGR#1219'), (5953230, 1997, u'MFGR#122'),
(10529427, 1997, u'MFGR#1220'), (9097752, 1997, u'MFGR#1221'), (8668003, 1997,
u'MFGR#1222'), (18232285, 1997, u'MFGR#1223'), (13859956, 1997, u'MFGR#1224'),
(2793729, 1997, u'MFGR#1225'), (19174753, 1997, u'MFGR#1226'), (5128426, 1997,
u'MFGR#123'), (4304076, 1997, u'MFGR#1230'), (8866362, 1997, u'MFGR#1232'),
(5328122, 1997, u'MFGR#1233'), (13735907, 1997, u'MFGR#1236'), (107550
17, 1997, u'MFGR#1240'), (327046, 1997, u'MFGR#125'), (13218597, 1997,
u'MFGR#127'), (10434877, 1997, u'MFGR#128'), (8052920, 1997, u'MFGR#129'),
(10864281, 1998, u'MFGR#121'), (2140471, 1998, u'MFGR#1211'), (15949227, 1998,
u'MFGR#1212'), (9091580, 1998, u'MFGR#1217'), (7834997, 1998, u'MFGR#1219'),
(2319634, 1998, u'MFGR#1220'), (19485508, 1998, u'MFGR#1222'), (1919741, 1998,
u'MFGR#1223'), (7617265, 1998, u'MFGR#1224'), (4074189, 1998, u'MFGR#1225'),
(7341274, 1998, u'MFGR#123'), (2607543, 1998, u'MFGR#1230'), (13307853, 1998,
u'MFGR#1232'), (5316438, 1998, u'MFGR#1233'), (1879252, 1998, u'MFGR#1236'),
(2738610, 1998, u'MFGR#1238'), (733435, 1998, u'MFGR#1239'), (5151646, 1998,
u'MFGR#1240'), (3651938, 1998, u'MFGR#126'), (8693908, 1998, u'MFGR#127'),
(2768015, 1998, u'MFGR#128'), (11569138, 1998, u'MFGR#129')]
+# manually adapted test output from ssbm test cases
+# Q1
+% .L1 # table_name
+% revenue # name
+% hugeint # type
+% 10 # length
+[ 4199635969 ]
-# 20:00:49 >
-# 20:00:49 > "Done."
-# 20:00:49 >
+# Q2
+% .L1 # table_name
+% revenue # name
+% hugeint # type
+% 9 # length
+[ 927530712 ]
+# Q3
+% .L1 # table_name
+% revenue # name
+% hugeint # type
+% 9 # length
+[ 213477639 ]
+
+# Q4
+% .L1, .dwdate, .part # table_name
+% L1, d_year, p_brand1 # name
+% hugeint, int, clob # type
+% 8, 4, 9 # length
+[ 35741623, 1992, "MFGR#1211" ]
+[ 13582129, 1992, "MFGR#1212" ]
+[ 2420150, 1992, "MFGR#1217" ]
+[ 7015912, 1992, "MFGR#1219" ]
+[ 2641607, 1992, "MFGR#122" ]
+[ 2563912, 1992, "MFGR#1221" ]
+[ 6003315, 1992, "MFGR#1223" ]
+[ 8704784, 1992, "MFGR#1224" ]
+[ 13700463, 1992, "MFGR#1225" ]
+[ 12610793, 1992, "MFGR#1226" ]
+[ 5995739, 1992, "MFGR#1228" ]
+[ 7552882, 1992, "MFGR#1230" ]
+[ 13184783, 1992, "MFGR#1232" ]
+[ 3231894, 1992, "MFGR#1240" ]
+[ 7214844, 1992, "MFGR#125" ]
+[ 35054814, 1992, "MFGR#127" ]
+[ 15102503, 1992, "MFGR#128" ]
+[ 7639101, 1992, "MFGR#129" ]
+[ 3339630, 1993, "MFGR#121" ]
+[ 11514911, 1993, "MFGR#1211" ]
+[ 4294668, 1993, "MFGR#1212" ]
+[ 8122643, 1993, "MFGR#1213" ]
+[ 3678145, 1993, "MFGR#1214" ]
+[ 7325684, 1993, "MFGR#1217" ]
+[ 16038869, 1993, "MFGR#1218" ]
+[ 26560659, 1993, "MFGR#1219" ]
+[ 5551142, 1993, "MFGR#1220" ]
+[ 3484096, 1993, "MFGR#1222" ]
+[ 21747351, 1993, "MFGR#1223" ]
+[ 5762459, 1993, "MFGR#1224" ]
+[ 10279155, 1993, "MFGR#1225" ]
+[ 9952878, 1993, "MFGR#1226" ]
+[ 6572535, 1993, "MFGR#1228" ]
+[ 10193031, 1993, "MFGR#1230" ]
+[ 12137253, 1993, "MFGR#1233" ]
+[ 6960104, 1993, "MFGR#1236" ]
+[ 10329821, 1993, "MFGR#1239" ]
+[ 4258048, 1993, "MFGR#1240" ]
+[ 1382981, 1993, "MFGR#125" ]
+[ 2821764, 1993, "MFGR#126" ]
+[ 14693311, 1993, "MFGR#127" ]
+[ 1799648, 1993, "MFGR#128" ]
+[ 5071393, 1993, "MFGR#129" ]
+[ 18995020, 1994, "MFGR#121" ]
+[ 4586682, 1994, "MFGR#1211" ]
+[ 19530708, 1994, "MFGR#1212" ]
+[ 1728488, 1994, "MFGR#1213" ]
+[ 13010765, 1994, "MFGR#1218" ]
+[ 10997176, 1994, "MFGR#1219" ]
+[ 4554495, 1994, "MFGR#122" ]
+[ 8557774, 1994, "MFGR#1220" ]
+[ 5584069, 1994, "MFGR#1222" ]
+[ 10104525, 1994, "MFGR#1223" ]
+[ 4775592, 1994, "MFGR#1224" ]
+[ 10713992, 1994, "MFGR#1225" ]
+[ 3750100, 1994, "MFGR#1226" ]
+[ 1794201, 1994, "MFGR#123" ]
+[ 5980941, 1994, "MFGR#1232" ]
+[ 7859272, 1994, "MFGR#1233" ]
+[ 3550796, 1994, "MFGR#1236" ]
+[ 2106877, 1994, "MFGR#1238" ]
+[ 14223208, 1994, "MFGR#1239" ]
+[ 4027318, 1994, "MFGR#1240" ]
+[ 17777153, 1994, "MFGR#125" ]
+[ 4869251, 1994, "MFGR#126" ]
+[ 15392246, 1994, "MFGR#127" ]
+[ 900044, 1994, "MFGR#128" ]
+[ 5656126, 1994, "MFGR#129" ]
+[ 1097742, 1995, "MFGR#1211" ]
+[ 2707025, 1995, "MFGR#1213" ]
+[ 4200351, 1995, "MFGR#1214" ]
+[ 2509211, 1995, "MFGR#1217" ]
+[ 5595420, 1995, "MFGR#1218" ]
+[ 9841612, 1995, "MFGR#1219" ]
+[ 4624540, 1995, "MFGR#1220" ]
+[ 19279359, 1995, "MFGR#1222" ]
+[ 5452000, 1995, "MFGR#1223" ]
+[ 18723136, 1995, "MFGR#1224" ]
+[ 14590136, 1995, "MFGR#1225" ]
+[ 8338345, 1995, "MFGR#1226" ]
+[ 8260673, 1995, "MFGR#1228" ]
+[ 97819, 1995, "MFGR#1230" ]
+[ 6377178, 1995, "MFGR#1232" ]
+[ 14117772, 1995, "MFGR#1233" ]
+[ 22661695, 1995, "MFGR#1236" ]
+[ 5142893, 1995, "MFGR#1239" ]
+[ 17227363, 1995, "MFGR#1240" ]
+[ 7873139, 1995, "MFGR#125" ]
+[ 14385634, 1995, "MFGR#128" ]
+[ 4383708, 1995, "MFGR#129" ]
+[ 12158316, 1996, "MFGR#121" ]
+[ 13534131, 1996, "MFGR#1211" ]
+[ 27850979, 1996, "MFGR#1212" ]
+[ 784827, 1996, "MFGR#1218" ]
+[ 1069800, 1996, "MFGR#122" ]
+[ 4348542, 1996, "MFGR#1221" ]
+[ 8295332, 1996, "MFGR#1222" ]
+[ 11183976, 1996, "MFGR#1224" ]
+[ 19971623, 1996, "MFGR#1225" ]
+[ 10005626, 1996, "MFGR#1232" ]
+[ 5135891, 1996, "MFGR#1236" ]
+[ 4613081, 1996, "MFGR#1239" ]
+[ 16358592, 1996, "MFGR#1240" ]
+[ 18374286, 1996, "MFGR#125" ]
+[ 4288542, 1996, "MFGR#126" ]
+[ 32750117, 1996, "MFGR#127" ]
+[ 128577, 1996, "MFGR#128" ]
+[ 6040770, 1996, "MFGR#129" ]
+[ 4313787, 1997, "MFGR#121" ]
+[ 15464411, 1997, "MFGR#1211" ]
+[ 17725171, 1997, "MFGR#1212" ]
+[ 2137125, 1997, "MFGR#1213" ]
+[ 4188998, 1997, "MFGR#1214" ]
+[ 4172057, 1997, "MFGR#1217" ]
+[ 15556327, 1997, "MFGR#1219" ]
+[ 5953230, 1997, "MFGR#122" ]
+[ 10529427, 1997, "MFGR#1220" ]
+[ 9097752, 1997, "MFGR#1221" ]
+[ 8668003, 1997, "MFGR#1222" ]
+[ 18232285, 1997, "MFGR#1223" ]
+[ 13859956, 1997, "MFGR#1224" ]
+[ 2793729, 1997, "MFGR#1225" ]
+[ 19174753, 1997, "MFGR#1226" ]
+[ 5128426, 1997, "MFGR#123" ]
+[ 4304076, 1997, "MFGR#1230" ]
+[ 8866362, 1997, "MFGR#1232" ]
+[ 5328122, 1997, "MFGR#1233" ]
+[ 13735907, 1997, "MFGR#1236" ]
+[ 10755017, 1997, "MFGR#1240" ]
+[ 327046, 1997, "MFGR#125" ]
+[ 13218597, 1997, "MFGR#127" ]
+[ 10434877, 1997, "MFGR#128" ]
+[ 8052920, 1997, "MFGR#129" ]
+[ 10864281, 1998, "MFGR#121" ]
+[ 2140471, 1998, "MFGR#1211" ]
+[ 15949227, 1998, "MFGR#1212" ]
+[ 9091580, 1998, "MFGR#1217" ]
+[ 7834997, 1998, "MFGR#1219" ]
+[ 2319634, 1998, "MFGR#1220" ]
+[ 19485508, 1998, "MFGR#1222" ]
+[ 1919741, 1998, "MFGR#1223" ]
+[ 7617265, 1998, "MFGR#1224" ]
+[ 4074189, 1998, "MFGR#1225" ]
+[ 7341274, 1998, "MFGR#123" ]
+[ 2607543, 1998, "MFGR#1230" ]
+[ 13307853, 1998, "MFGR#1232" ]
+[ 5316438, 1998, "MFGR#1233" ]
+[ 1879252, 1998, "MFGR#1236" ]
+[ 2738610, 1998, "MFGR#1238" ]
+[ 733435, 1998, "MFGR#1239" ]
+[ 5151646, 1998, "MFGR#1240" ]
+[ 3651938, 1998, "MFGR#126" ]
+[ 8693908, 1998, "MFGR#127" ]
+[ 2768015, 1998, "MFGR#128" ]
+[ 11569138, 1998, "MFGR#129" ]
+
+# Q5
+% .L1, .dwdate, .part # table_name
+% L1, d_year, p_brand1 # name
+% hugeint, int, clob # type
+% 8, 4, 9 # length
+[ 10306232, 1992, "MFGR#2221" ]
+[ 7096296, 1992, "MFGR#2222" ]
+[ 13538169, 1992, "MFGR#2224" ]
+[ 588657, 1992, "MFGR#2225" ]
+[ 2064857, 1992, "MFGR#2226" ]
+[ 19175615, 1992, "MFGR#2227" ]
+[ 5597060, 1993, "MFGR#2221" ]
+[ 1012379, 1993, "MFGR#2222" ]
+[ 13096133, 1993, "MFGR#2223" ]
+[ 8200828, 1993, "MFGR#2224" ]
+[ 880669, 1993, "MFGR#2225" ]
+[ 6530070, 1993, "MFGR#2226" ]
+[ 8174486, 1993, "MFGR#2227" ]
+[ 20407818, 1994, "MFGR#2221" ]
+[ 288819, 1994, "MFGR#2222" ]
+[ 6642402, 1994, "MFGR#2223" ]
+[ 13970991, 1994, "MFGR#2224" ]
+[ 11207503, 1994, "MFGR#2226" ]
+[ 14038987, 1994, "MFGR#2227" ]
+[ 9206253, 1995, "MFGR#2222" ]
+[ 10583880, 1995, "MFGR#2223" ]
+[ 4168114, 1995, "MFGR#2224" ]
+[ 4480694, 1995, "MFGR#2226" ]
+[ 5318366, 1995, "MFGR#2227" ]
+[ 7037757, 1996, "MFGR#2221" ]
+[ 4626343, 1996, "MFGR#2222" ]
+[ 6680802, 1996, "MFGR#2223" ]
+[ 7899650, 1996, "MFGR#2224" ]
+[ 3943542, 1996, "MFGR#2225" ]
+[ 8618649, 1996, "MFGR#2226" ]
+[ 21285135, 1996, "MFGR#2227" ]
+[ 14925990, 1997, "MFGR#2221" ]
+[ 9139251, 1997, "MFGR#2222" ]
+[ 307521, 1997, "MFGR#2223" ]
+[ 8791563, 1997, "MFGR#2224" ]
+[ 5652967, 1997, "MFGR#2225" ]
+[ 10920254, 1997, "MFGR#2226" ]
+[ 3463448, 1997, "MFGR#2227" ]
+[ 3697632, 1998, "MFGR#2221" ]
+[ 17884495, 1998, "MFGR#2222" ]
+[ 6450682, 1998, "MFGR#2223" ]
+[ 8158474, 1998, "MFGR#2224" ]
+[ 4449696, 1998, "MFGR#2225" ]
+[ 5931644, 1998, "MFGR#2226" ]
+[ 18442636, 1998, "MFGR#2227" ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
