Changeset: c601d68b043c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c601d68b043c
Modified Files:
sql/test/remote/Tests/ssbm.SQL.py
sql/test/remote/Tests/ssbm.stable.out
sql/test/remote/Tests/ssbm.stable.out.int128
Branch: Jun2016
Log Message:
extended ssbm test with a remote table query.
diffs (187 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
@@ -184,6 +184,9 @@ for workerrec in workers:
c.execute(atable)
# sanity check
+c.execute("select count(*) from lineorder_0")
+print str(c.fetchall()[0][0]) + ' rows in remote table'
+
c.execute("select count(*) from lineorder")
print str(c.fetchall()[0][0]) + ' rows in mergetable'
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
@@ -6,6 +6,11 @@ Ready.
# 14:14:37 > "/usr/local/opt/python/bin/python2.7" "ssbm.SQL.py" "ssbm"
# 14:14:37 >
+# 11:09:02 >
+# 11:09:02 > "/usr/bin/python2" "ssbm.SQL.py" "ssbm"
+# 11:09:02 >
+
+12036 rows in remote table
60175 rows in mergetable
356
356
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
@@ -2,6 +2,11 @@ stdout of test 'ssbm` in directory 'sql/
Ready.
+# 11:09:02 >
+# 11:09:02 > "/usr/bin/python2" "ssbm.SQL.py" "ssbm"
+# 11:09:02 >
+
+12036 rows in remote table
60175 rows in mergetable
356
356
@@ -408,26 +413,83 @@ 356
[ "JAPAN", "JAPAN", 1997, 26883620 ]
[ "INDIA", "JAPAN", 1997, 15498069 ]
-# Q8
-% .customer, .supplier, .dwdate, . # table_name
+# 11:09:07 >
+# 11:09:07 > Mtimeout -timeout 60 mclient -lsql -ftest -Eutf-8 -i -e
--port=60477 --database=master --host=localhost <
"/home/niels/data/rc/clean/sql/benchmarks/ssbm/Tests/08.sql"
+# 11:09:07 >
+
+#select c_city, s_city, d_year, sum(lo_revenue) as revenue
+# from customer, lineorder, supplier, dwdate
+# where lo_custkey = c_custkey
+# and lo_suppkey = s_suppkey
+# and lo_orderdate = d_datekey
+# and c_nation = 'UNITED STATES'
+# and s_nation = 'UNITED STATES'
+# and d_year >= 1992 and d_year <= 1997
+# group by c_city, s_city, d_year
+# order by d_year asc, revenue desc;
+% .customer, .supplier, .dwdate, .L1 # table_name
% c_city, s_city, d_year, revenue # name
% clob, clob, int, hugeint # type
% 0, 0, 1, 1 # length
-# Q09
-% .customer, .supplier, .dwdate, . # table_name
+# 11:09:08 >
+# 11:09:08 > Mtimeout -timeout 60 mclient -lsql -ftest -Eutf-8 -i -e
--port=60477 --database=master --host=localhost <
"/home/niels/data/rc/clean/sql/benchmarks/ssbm/Tests/09.sql"
+# 11:09:08 >
+
+#select c_city, s_city, d_year, sum(lo_revenue) as revenue
+# from customer, lineorder, supplier, dwdate
+# where lo_custkey = c_custkey
+# and lo_suppkey = s_suppkey
+# and lo_orderdate = d_datekey
+# and c_nation = 'UNITED KINGDOM'
+# and (c_city='UNITED KI1' or c_city='UNITED KI5')
+# and (s_city='UNITED KI1' or s_city='UNITED KI5')
+# and s_nation = 'UNITED KINGDOM'
+# and d_year >= 1992 and d_year <= 1997
+# group by c_city, s_city, d_year
+# order by d_year asc, revenue desc;
+% .customer, .supplier, .dwdate, .L1 # table_name
% c_city, s_city, d_year, revenue # name
% clob, clob, int, hugeint # type
% 0, 0, 1, 1 # length
-# Q10
-% .customer, .supplier, .dwdate, . # table_name
+# 11:09:08 >
+# 11:09:08 > Mtimeout -timeout 60 mclient -lsql -ftest -Eutf-8 -i -e
--port=60477 --database=master --host=localhost <
"/home/niels/data/rc/clean/sql/benchmarks/ssbm/Tests/10.sql"
+# 11:09:08 >
+
+#select c_city, s_city, d_year, sum(lo_revenue) as revenue
+# from customer, lineorder, supplier, dwdate
+# where lo_custkey = c_custkey
+# and lo_suppkey = s_suppkey
+# and lo_orderdate = d_datekey
+# and c_nation = 'UNITED KINGDOM'
+# and (c_city='UNITED KI1' or c_city='UNITED KI5')
+# and (s_city='UNITED KI1' or s_city='UNITED KI5')
+# and s_nation = 'UNITED KINGDOM'
+# and d_yearmonth = 'Dec1997'
+# group by c_city, s_city, d_year
+# order by d_year asc, revenue desc;
+% .customer, .supplier, .dwdate, .L1 # table_name
% c_city, s_city, d_year, revenue # name
% clob, clob, int, hugeint # type
% 0, 0, 1, 1 # length
-# Q11
-% .dwdate, .customer, . # table_name
+# 11:09:09 >
+# 11:09:09 > Mtimeout -timeout 60 mclient -lsql -ftest -Eutf-8 -i -e
--port=60477 --database=master --host=localhost <
"/home/niels/data/rc/clean/sql/benchmarks/ssbm/Tests/11.sql"
+# 11:09:09 >
+
+#select d_year, c_nation, sum(lo_revenue-lo_supplycost) as profit1
+# from dwdate, customer, supplier, part, lineorder
+# where lo_custkey = c_custkey
+# and lo_suppkey = s_suppkey
+# and lo_partkey = p_partkey
+# and lo_orderdate = d_datekey
+# and c_region = 'AMERICA'
+# and s_region = 'AMERICA'
+# and (p_mfgr = 'MFGR#1' or p_mfgr = 'MFGR#2')
+# group by d_year, c_nation
+# order by d_year, c_nation;
+% .dwdate, .customer, .L1 # table_name
% d_year, c_nation, profit1 # name
% int, clob, hugeint # type
% 4, 9, 9 # length
@@ -460,8 +522,23 @@ 356
[ 1998, "CANADA", 93061401 ]
[ 1998, "PERU", 41688725 ]
-# Q12
-% .dwdate, .supplier, .part, . # table_name
+# 11:09:09 >
+# 11:09:09 > Mtimeout -timeout 60 mclient -lsql -ftest -Eutf-8 -i -e
--port=60477 --database=master --host=localhost <
"/home/niels/data/rc/clean/sql/benchmarks/ssbm/Tests/12.sql"
+# 11:09:09 >
+
+#select d_year, s_nation, p_category, sum(lo_revenue-lo_supplycost) as profit1
+# from dwdate, customer, supplier, part, lineorder
+# where lo_custkey = c_custkey
+# and lo_suppkey = s_suppkey
+# and lo_partkey = p_partkey
+# and lo_orderdate = d_datekey
+# and c_region = 'AMERICA'
+# and s_region = 'AMERICA'
+# and (d_year = 1997 or d_year = 1998)
+# and (p_mfgr = 'MFGR#1' or p_mfgr = 'MFGR#2')
+# group by d_year, s_nation, p_category
+# order by d_year, s_nation, p_category;
+% .dwdate, .supplier, .part, .L1 # table_name
% d_year, s_nation, p_category, profit1 # name
% int, clob, clob, hugeint # type
% 4, 13, 7, 8 # length
@@ -542,8 +619,23 @@ 356
[ 1998, "UNITED STATES", "MFGR#24", 8482069 ]
[ 1998, "UNITED STATES", "MFGR#25", 3295629 ]
-# Q13
-% .dwdate, .supplier, .part, . # table_name
+# 11:09:09 >
+# 11:09:09 > Mtimeout -timeout 60 mclient -lsql -ftest -Eutf-8 -i -e
--port=60477 --database=master --host=localhost <
"/home/niels/data/rc/clean/sql/benchmarks/ssbm/Tests/13.sql"
+# 11:09:09 >
+
+#select d_year, s_city, p_brand1, sum(lo_revenue-lo_supplycost) as profit1
+# from dwdate, customer, supplier, part, lineorder
+# where lo_custkey = c_custkey
+# and lo_suppkey = s_suppkey
+# and lo_partkey = p_partkey
+# and lo_orderdate = d_datekey
+# and c_region = 'AMERICA'
+# and s_nation = 'UNITED STATES'
+# and (d_year = 1997 or d_year = 1998)
+# and p_category = 'MFGR#14'
+# group by d_year, s_city, p_brand1
+# order by d_year, s_city, p_brand1;
+% .dwdate, .supplier, .part, .L1 # table_name
% d_year, s_city, p_brand1, profit1 # name
% int, clob, clob, hugeint # type
% 4, 10, 9, 7 # length
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
