Changeset: 88cb4bd11591 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=88cb4bd11591
Modified Files:
sql/test/remote/Tests/partition_elim.stable.out
sql/test/remote/Tests/ssbm.stable.err
sql/test/remote/Tests/ssbm.stable.out.int128
Branch: malerrors
Log Message:
approved output
diffs (truncated from 868 to 300 lines):
diff --git a/sql/test/remote/Tests/partition_elim.stable.out
b/sql/test/remote/Tests/partition_elim.stable.out
--- a/sql/test/remote/Tests/partition_elim.stable.out
+++ b/sql/test/remote/Tests/partition_elim.stable.out
@@ -135,7 +135,7 @@ Ready.
% mal # name
% clob # type
% 117 # length
-function user.main():void;
+function user.SQLanalyze():void;
X_5:void := querylog.define("explain select x,y from test where x between
4.0 and 6.0;", "default_pipe", 49:int);
barrier X_144 := language.dataflow();
X_40:bat[:dbl] := bat.new(nil:dbl);
@@ -190,7 +190,7 @@ barrier X_144 := language.dataflow();
language.pass(C_125);
exit X_144;
sql.resultSet(X_65, X_66, X_68, X_69, X_70, X_43, X_46);
-end user.main;
+end user.SQLanalyze;
#inline actions= 0 time=3 usec
#remap actions= 0 time=8 usec
#costmodel actions= 1 time=4 usec
@@ -220,7 +220,7 @@ end user.main;
% mal # name
% clob # type
% 121 # length
-function user.main():void;
+function user.SQLanalyze():void;
X_8:void := querylog.define("explain select x,y from test where x between
(7-3) and (7-1);", "default_pipe", 63:int);
barrier X_164 := language.dataflow();
X_55:bat[:dbl] := bat.new(nil:dbl);
@@ -275,10 +275,10 @@ barrier X_164 := language.dataflow();
language.pass(C_145);
exit X_164;
sql.resultSet(X_80, X_81, X_83, X_84, X_85, X_58, X_61);
-end user.main;
-#inline actions= 0 time=3 usec
-#remap actions= 0 time=9 usec
-#costmodel actions= 1 time=3 usec
+end user.SQLanalyze;
+#inline actions= 0 time=2 usec
+#remap actions= 0 time=6 usec
+#costmodel actions= 1 time=5 usec
#coercion actions= 0 time=4 usec
#evaluate actions=20 time=82 usec
#emptybind actions= 0 time=19 usec
@@ -305,7 +305,7 @@ end user.main;
% mal # name
% clob # type
% 143 # length
-function user.main():void;
+function user.SQLanalyze():void;
X_9:void := querylog.define("explain select x,y from test where x between
4.0 and 6.0 and y between 0.0 and 2.0;", "default_pipe", 37:int);
barrier X_132 := language.dataflow();
X_36 := bat.new(nil:str);
@@ -350,7 +350,7 @@ barrier X_132 := language.dataflow();
language.pass(X_106);
exit X_132;
sql.resultSet(X_52, X_53, X_55, X_56, X_57, X_32, X_33);
-end user.main;
+end user.SQLanalyze;
#inline actions= 0 time=2 usec
#remap actions= 0 time=8 usec
#costmodel actions= 1 time=3 usec
@@ -380,7 +380,7 @@ end user.main;
% mal # name
% clob # type
% 156 # length
-function user.main():void;
+function user.SQLanalyze():void;
X_12:void := querylog.define("explain select x,y from test where x between
4.0 and 6.0 and y between (1.0-1.0) and (4.0-2.0);", "default_pipe", 45:int);
barrier X_147 := language.dataflow();
X_46 := bat.new(nil:str);
@@ -425,10 +425,10 @@ barrier X_147 := language.dataflow();
language.pass(X_121);
exit X_147;
sql.resultSet(X_63, X_64, X_66, X_67, X_68, X_42, X_43);
-end user.main;
-#inline actions= 0 time=2 usec
-#remap actions= 0 time=8 usec
-#costmodel actions= 1 time=2 usec
+end user.SQLanalyze;
+#inline actions= 0 time=1 usec
+#remap actions= 0 time=5 usec
+#costmodel actions= 1 time=5 usec
#coercion actions= 0 time=3 usec
#evaluate actions=16 time=60 usec
#emptybind actions= 0 time=16 usec
@@ -455,7 +455,7 @@ end user.main;
% mal # name
% clob # type
% 160 # length
-function user.main():void;
+function user.SQLanalyze():void;
X_15:void := querylog.define("explain select x,y from test where x between
(7-3) and (7-1) and y between (1.0-1.0) and (4.0-2.0);", "default_pipe",
53:int);
barrier X_160 := language.dataflow();
X_55 := bat.new(nil:str);
@@ -500,7 +500,7 @@ barrier X_160 := language.dataflow();
language.pass(X_134);
exit X_160;
sql.resultSet(X_72, X_73, X_75, X_76, X_77, X_51, X_52);
-end user.main;
+end user.SQLanalyze;
#inline actions= 0 time=2 usec
#remap actions= 0 time=8 usec
#costmodel actions= 1 time=3 usec
diff --git a/sql/test/remote/Tests/ssbm.stable.err
b/sql/test/remote/Tests/ssbm.stable.err
--- a/sql/test/remote/Tests/ssbm.stable.err
+++ b/sql/test/remote/Tests/ssbm.stable.err
@@ -138,18 +138,6 @@ stderr of test 'ssbm` in directory 'sql/
# cmdline opt mapi_port = 33166
# cmdline opt gdk_dbpath = /tmp/remotetest/worker_4/worker_4
# cmdline opt gdk_debug = 536870922
-Traceback (most recent call last):
- File "ssbm.SQL.py", line 193, in <module>
- c.execute("select * from lineorder where lo_orderkey=356")
- File "/ufs/mk/.local/lib/python2.7/site-packages/pymonetdb/sql/cursors.py",
line 164, in execute
- block = self.connection.execute(query)
- File
"/ufs/mk/.local/lib/python2.7/site-packages/pymonetdb/sql/connections.py", line
133, in execute
- return self.command('s' + query + ';')
- File
"/ufs/mk/.local/lib/python2.7/site-packages/pymonetdb/sql/connections.py", line
138, in command
- return self.mapi.cmd(command)
- File "/ufs/mk/.local/lib/python2.7/site-packages/pymonetdb/mapi.py", line
221, in cmd
- raise exception(string)
-pymonetdb.exceptions.OperationalError: bad tseqbase value: 9223372036854775808
# 20:00:49 >
# 20:00:49 > "Done."
diff --git a/sql/test/remote/Tests/ssbm.stable.out.int128
b/sql/test/remote/Tests/ssbm.stable.out.int128
--- a/sql/test/remote/Tests/ssbm.stable.out.int128
+++ b/sql/test/remote/Tests/ssbm.stable.out.int128
@@ -8,6 +8,737 @@ Ready.
12036 rows in remote table
60175 rows in mergetable
+356
+356
+# Running Q 01
+
+# 22:13:42 >
+# 22:13:42 > Mtimeout -timeout 60 mclient -lsql -ftest -Eutf-8 -i -e
--port=37905 --database=master --host=localhost <
"/home/niels/data/malparsing/sql/benchmarks/ssbm/Tests/01.sql"
+# 22:13:42 >
+
+#select sum(lo_extendedprice*lo_discount) as revenue
+# from lineorder, dwdate
+# where lo_orderdate = d_datekey
+# and d_year = 1993
+# and lo_discount between 1 and 3
+# and lo_quantity < 25;
+% .L4 # table_name
+% revenue # name
+% hugeint # type
+% 10 # length
+[ 4199635969 ]
+# Running Q 02
+
+# 22:13:42 >
+# 22:13:42 > Mtimeout -timeout 60 mclient -lsql -ftest -Eutf-8 -i -e
--port=37905 --database=master --host=localhost <
"/home/niels/data/malparsing/sql/benchmarks/ssbm/Tests/02.sql"
+# 22:13:42 >
+
+#select sum(lo_extendedprice*lo_discount) as revenue
+# from lineorder, dwdate
+# where lo_orderdate = d_datekey
+# and d_yearmonthnum = 199401
+# and lo_discount between 4 and 6
+# and lo_quantity between 26 and 35;
+% .L4 # table_name
+% revenue # name
+% hugeint # type
+% 9 # length
+[ 927530712 ]
+# Running Q 03
+
+# 22:13:42 >
+# 22:13:42 > Mtimeout -timeout 60 mclient -lsql -ftest -Eutf-8 -i -e
--port=37905 --database=master --host=localhost <
"/home/niels/data/malparsing/sql/benchmarks/ssbm/Tests/03.sql"
+# 22:13:42 >
+
+#select sum(lo_extendedprice*lo_discount) as revenue
+# from lineorder, dwdate
+# where lo_orderdate = d_datekey
+# and d_weeknuminyear = 6 and d_year = 1994
+# and lo_discount between 5 and 7
+# and lo_quantity between 36 and 40;
+% .L4 # table_name
+% revenue # name
+% hugeint # type
+% 9 # length
+[ 213477639 ]
+# Running Q 04
+
+# 22:13:42 >
+# 22:13:42 > Mtimeout -timeout 60 mclient -lsql -ftest -Eutf-8 -i -e
--port=37905 --database=master --host=localhost <
"/home/niels/data/malparsing/sql/benchmarks/ssbm/Tests/04.sql"
+# 22:13:42 >
+
+#select sum(lo_revenue), d_year, p_brand1
+# from lineorder, dwdate, part, supplier
+# where lo_orderdate = d_datekey
+# and lo_partkey = p_partkey
+# and lo_suppkey = s_suppkey
+# and p_category = 'MFGR#12' -- OK to add p_mfgr = âMFGR#1â
+# and s_region = 'AMERICA'
+# group by d_year, p_brand1
+# order by d_year, p_brand1;
+% .L3, .dwdate, .part # table_name
+% L2, 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" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list