Changeset: 2ef3ebe7fa98 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2ef3ebe7fa98 Modified Files: sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64 sql/test/remote/Tests/ssbm.stable.out Branch: sq2default Log Message:
Approved output diffs (227 lines): diff --git a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64 b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64 --- a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64 +++ b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64 @@ -29,8 +29,8 @@ stdout of test 'overflow.SF-2853458` in # 11:23:53 > #select cast(power(2,63) as bigint); -% .L2 # table_name -% L2 # name +% .%1 # table_name +% %1 # name % bigint # type % 19 # length [ 9223372036854775807 ] 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 @@ -32,29 +32,59 @@ 356 # and d_year = 1993 # and lo_discount between 1 and 3 # and lo_quantity < 25; -% .L1 # table_name +% .%1 # table_name % revenue # name % bigint # type % 10 # length [ 4199635969 ] -# Q2 -% .L1 # table_name +# 10:04:01 > +# 10:04:01 > mclient -lsql -ftest -tnone -Eutf-8 -i -e --host=/var/tmp/mtest-57982 --port=33801 --database=master < "/home/ferreira/repositories/MonetDB-Apr2019/src/sql/benchmarks/ssbm/Tests/02.sql" +# 10:04:01 > + +#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; +% .%1 # table_name % revenue # name % bigint # type % 9 # length [ 927530712 ] -# Q3 -% .L1 # table_name +# 10:04:01 > +# 10:04:01 > mclient -lsql -ftest -tnone -Eutf-8 -i -e --host=/var/tmp/mtest-57982 --port=33801 --database=master < "/home/ferreira/repositories/MonetDB-Apr2019/src/sql/benchmarks/ssbm/Tests/03.sql" +# 10:04:01 > + +#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; +% .%1 # table_name % revenue # name % bigint # type % 9 # length [ 213477639 ] -# Q4 -% .L1, .dwdate, .part # table_name -% L1, d_year, p_brand1 # name +# 10:04:01 > +# 10:04:01 > mclient -lsql -ftest -tnone -Eutf-8 -i -e --host=/var/tmp/mtest-57982 --port=33801 --database=master < "/home/ferreira/repositories/MonetDB-Apr2019/src/sql/benchmarks/ssbm/Tests/04.sql" +# 10:04:01 > + +#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; +% .%1, .dwdate, .part # table_name +% %1, d_year, p_brand1 # name % bigint, int, clob # type % 8, 4, 9 # length [ 35741623, 1992, "MFGR#1211" ] @@ -213,9 +243,23 @@ 356 [ 2768015, 1998, "MFGR#128" ] [ 11569138, 1998, "MFGR#129" ] -# Q5 -% .L1, .dwdate, .part # table_name -% L1, d_year, p_brand1 # name +# 10:04:01 > +# 10:04:01 > mclient -lsql -ftest -tnone -Eutf-8 -i -e --host=/var/tmp/mtest-57982 --port=33801 --database=master < "/home/ferreira/repositories/MonetDB-Apr2019/src/sql/benchmarks/ssbm/Tests/05.sql" +# 10:04:01 > + +#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 +# -- OK to add p_mfgr=’MFGR#2’ +# -- OK to add p_category=’MFGR#22’ +# and p_brand1 between 'MFGR#2221' and 'MFGR#2228' +# and s_region = 'ASIA' +# group by d_year, p_brand1 +# order by d_year, p_brand1; +% .%1, .dwdate, .part # table_name +% %1, d_year, p_brand1 # name % bigint, int, clob # type % 8, 4, 9 # length [ 10306232, 1992, "MFGR#2221" ] @@ -264,9 +308,19 @@ 356 [ 5931644, 1998, "MFGR#2226" ] [ 18442636, 1998, "MFGR#2227" ] -# Q6 -% .L1, .dwdate, .part # table_name -% L1, d_year, p_brand1 # name +#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 +# -- OK to add p_mfgr=’MFGR#2’ +# -- OK to add p_category=’MFGR#22’ +# and p_brand1 = 'MFGR#2221' +# and s_region = 'EUROPE' +# group by d_year, p_brand1 +# order by d_year, p_brand1; +% .%1, .dwdate, .part # table_name +% %1, d_year, p_brand1 # name % bigint, int, clob # type % 8, 4, 9 # length [ 2535744, 1992, "MFGR#2221" ] @@ -442,26 +496,83 @@ 356 [ "JAPAN", "JAPAN", 1997, 26883620 ] [ "INDIA", "JAPAN", 1997, 15498069 ] -# Q8 -% .customer, .supplier, .dwdate, . # table_name +# 10:04:02 > +# 10:04:02 > mclient -lsql -ftest -tnone -Eutf-8 -i -e --host=/var/tmp/mtest-57982 --port=33801 --database=master < "/home/ferreira/repositories/MonetDB-Apr2019/src/sql/benchmarks/ssbm/Tests/08.sql" +# 10:04:02 > + +#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, .%1 # table_name % c_city, s_city, d_year, revenue # name % clob, clob, int, bigint # type % 0, 0, 1, 1 # length -# Q09 -% .customer, .supplier, .dwdate, . # table_name +# 10:04:02 > +# 10:04:02 > mclient -lsql -ftest -tnone -Eutf-8 -i -e --host=/var/tmp/mtest-57982 --port=33801 --database=master < "/home/ferreira/repositories/MonetDB-Apr2019/src/sql/benchmarks/ssbm/Tests/09.sql" +# 10:04:02 > + +#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, .%1 # table_name % c_city, s_city, d_year, revenue # name % clob, clob, int, bigint # type % 0, 0, 1, 1 # length -# Q10 -% .customer, .supplier, .dwdate, . # table_name +# 10:04:02 > +# 10:04:02 > mclient -lsql -ftest -tnone -Eutf-8 -i -e --host=/var/tmp/mtest-57982 --port=33801 --database=master < "/home/ferreira/repositories/MonetDB-Apr2019/src/sql/benchmarks/ssbm/Tests/10.sql" +# 10:04:02 > + +#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, .%1 # table_name % c_city, s_city, d_year, revenue # name % clob, clob, int, bigint # type % 0, 0, 1, 1 # length -# Q11 -% .dwdate, .customer, . # table_name +# 10:04:02 > +# 10:04:02 > mclient -lsql -ftest -tnone -Eutf-8 -i -e --host=/var/tmp/mtest-57982 --port=33801 --database=master < "/home/ferreira/repositories/MonetDB-Apr2019/src/sql/benchmarks/ssbm/Tests/11.sql" +# 10:04:02 > + +#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, .%1 # table_name % d_year, c_nation, profit1 # name % int, clob, bigint # type % 4, 9, 9 # length _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
