Changeset: 4a661c3cd896 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a661c3cd896
Modified Files:
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/01.stable.out
sql/benchmarks/tpch/LOCKED/Tests/01.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/03.stable.out
sql/benchmarks/tpch/LOCKED/Tests/03.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/04.stable.out
sql/benchmarks/tpch/LOCKED/Tests/05.stable.out
sql/benchmarks/tpch/LOCKED/Tests/05.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/06.stable.out
sql/benchmarks/tpch/LOCKED/Tests/06.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/07.stable.out
sql/benchmarks/tpch/LOCKED/Tests/07.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/08.stable.out
sql/benchmarks/tpch/LOCKED/Tests/08.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/09.stable.out
sql/benchmarks/tpch/LOCKED/Tests/09.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/10.stable.out
sql/benchmarks/tpch/LOCKED/Tests/10.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/11.stable.out
sql/benchmarks/tpch/LOCKED/Tests/11.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/12.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/13.stable.out
sql/benchmarks/tpch/LOCKED/Tests/14.stable.out
sql/benchmarks/tpch/LOCKED/Tests/14.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/16.stable.out
sql/benchmarks/tpch/LOCKED/Tests/17.stable.out
sql/benchmarks/tpch/LOCKED/Tests/17.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/18.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/19.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/21.stable.out
sql/benchmarks/tpch/LOCKED/Tests/21.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/22.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/check2.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/Tests/01.stable.out
sql/benchmarks/tpch/Tests/01.stable.out.int128
sql/benchmarks/tpch/Tests/03.stable.out
sql/benchmarks/tpch/Tests/03.stable.out.int128
sql/benchmarks/tpch/Tests/04.stable.out
sql/benchmarks/tpch/Tests/05.stable.out
sql/benchmarks/tpch/Tests/05.stable.out.int128
sql/benchmarks/tpch/Tests/06.stable.out
sql/benchmarks/tpch/Tests/06.stable.out.int128
sql/benchmarks/tpch/Tests/07.stable.out
sql/benchmarks/tpch/Tests/07.stable.out.int128
sql/benchmarks/tpch/Tests/08.stable.out
sql/benchmarks/tpch/Tests/08.stable.out.int128
sql/benchmarks/tpch/Tests/09.stable.out
sql/benchmarks/tpch/Tests/09.stable.out.int128
sql/benchmarks/tpch/Tests/10.stable.out
sql/benchmarks/tpch/Tests/10.stable.out.int128
sql/benchmarks/tpch/Tests/11.stable.out
sql/benchmarks/tpch/Tests/11.stable.out.int128
sql/benchmarks/tpch/Tests/12.stable.out.int128
sql/benchmarks/tpch/Tests/13.stable.out
sql/benchmarks/tpch/Tests/14.stable.out
sql/benchmarks/tpch/Tests/14.stable.out.int128
sql/benchmarks/tpch/Tests/16.stable.out
sql/benchmarks/tpch/Tests/17.stable.out
sql/benchmarks/tpch/Tests/17.stable.out.int128
sql/benchmarks/tpch/Tests/18.stable.out.int128
sql/benchmarks/tpch/Tests/19.stable.out.int128
sql/benchmarks/tpch/Tests/21.stable.out
sql/benchmarks/tpch/Tests/22.stable.out
sql/benchmarks/tpch/Tests/22.stable.out.int128
Branch: sq2default
Log Message:
approved output
diffs (truncated from 1534 to 300 lines):
diff --git a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
--- a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
+++ b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
@@ -48,7 +48,7 @@ stdout of test '01-22` in directory 'sql
#order by
# l_returnflag,
# l_linestatus;
-% sys.lineitem, sys.lineitem, sys.L5, sys.L10, sys.L13,
sys.L16, sys.L21, sys.L24, sys.L27, sys.L32 #
table_name
+% sys.lineitem, sys.lineitem, sys.%1, sys.%2, sys.%3, sys.%4, sys.%5,
sys.%6, sys.%7, sys.%10 # table_name
% l_returnflag, l_linestatus, sum_qty, sum_base_price,
sum_disc_price, sum_charge, avg_qty, avg_price, avg_disc,
count_order # name
% char, char, decimal, decimal, decimal,
decimal, double, double, double, bigint # type
% 1, 1, 20, 20, 20, 20, 24, 24, 24, 5 #
length
@@ -93,7 +93,7 @@ stdout of test '01-22` in directory 'sql
# revenue desc,
# o_orderdate
#limit 10;
-% sys.lineitem, sys.L4, sys.orders, sys.orders # table_name
+% sys.lineitem, sys.%1, sys.orders, sys.orders # table_name
% l_orderkey, revenue, o_orderdate, o_shippriority # name
% int, decimal, date, int # type
% 5, 20, 10, 1 # length
@@ -133,7 +133,7 @@ stdout of test '01-22` in directory 'sql
# o_orderpriority
#order by
# o_orderpriority;
-% sys.orders, sys.L12 # table_name
+% sys.orders, sys.%2 # table_name
% o_orderpriority, order_count # name
% char, bigint # type
% 15, 3 # length
@@ -171,7 +171,7 @@ stdout of test '01-22` in directory 'sql
# n_name
#order by
# revenue desc;
-% sys.nation, sys.L4 # table_name
+% sys.nation, sys.%1 # table_name
% n_name, revenue # name
% char, decimal # type
% 25, 20 # length
@@ -194,7 +194,7 @@ stdout of test '01-22` in directory 'sql
# and l_shipdate < date '1994-01-01' + interval '1' year
# and l_discount between 0.06 - 0.01 and 0.06 + 0.01
# and l_quantity < 24;
-% sys.L4 # table_name
+% sys.%1 # table_name
% revenue # name
% decimal # type
% 20 # length
@@ -231,7 +231,7 @@ stdout of test '01-22` in directory 'sql
# and c_nationkey = n2.n_nationkey
# and (
# (n1.n_name = 'FRANCE' and n2.n_name = 'GERMANY')
-% sys.shipping, sys.shipping, sys.shipping, sys.L16 # table_name
+% sys.shipping, sys.shipping, sys.shipping, sys.%1 # table_name
% supp_nation, cust_nation, l_year, revenue # name
% char, char, int, decimal # type
% 25, 25, 4, 20 # length
@@ -272,7 +272,7 @@ stdout of test '01-22` in directory 'sql
# and o_custkey = c_custkey
# and c_nationkey = n1.n_nationkey
# and n1.n_regionkey = r_regionkey
-% sys.all_nations, sys.L14 # table_name
+% sys.all_nations, sys. # table_name
% o_year, mkt_share # name
% int, decimal # type
% 4, 20 # length
@@ -309,7 +309,7 @@ stdout of test '01-22` in directory 'sql
# and s_nationkey = n_nationkey
# and p_name like '%green%'
# ) as profit
-% sys.profit, sys.profit, sys.L13 # table_name
+% sys.profit, sys.profit, sys.%1 # table_name
% nation, o_year, sum_profit # name
% char, int, decimal # type
% 25, 4, 20 # length
@@ -523,7 +523,7 @@ stdout of test '01-22` in directory 'sql
#order by
# revenue desc
#limit 20;
-% sys.customer, sys.customer, sys.L5, sys.customer, sys.nation,
sys.customer, sys.customer, sys.customer # table_name
+% sys.customer, sys.customer, sys.%1, sys.customer, sys.nation,
sys.customer, sys.customer, sys.customer # table_name
% c_custkey, c_name, revenue, c_acctbal, n_name, c_address,
c_phone, c_comment # name
% int, varchar, decimal, decimal, char, varchar,
char, varchar # type
% 4, 18, 20, 17, 25, 40, 15, 116 # length
@@ -575,7 +575,7 @@ stdout of test '01-22` in directory 'sql
# from
# partsupp,
# supplier,
-% sys.partsupp, sys.L4 # table_name
+% sys.partsupp, sys.%1 # table_name
% ps_partkey, value # name
% int, decimal # type
% 4, 20 # length
@@ -609,7 +609,7 @@ stdout of test '01-22` in directory 'sql
# and l_shipdate < l_commitdate
# and l_receiptdate >= date '1994-01-01'
# and l_receiptdate < date '1994-01-01' + interval '1' year
-% sys.lineitem, sys.L4, sys.L7 # table_name
+% sys.lineitem, sys.%1, sys.%2 # table_name
% l_shipmode, high_line_count, low_line_count # name
% char, bigint, bigint # type
% 10, 2, 2 # length
@@ -640,7 +640,7 @@ stdout of test '01-22` in directory 'sql
#order by
# custdist desc,
# c_count desc;
-% .c_orders, .L7 # table_name
+% .c_orders, .%4 # table_name
% c_count, custdist # name
% bigint, bigint # type
% 2, 3 # length
@@ -695,7 +695,7 @@ stdout of test '01-22` in directory 'sql
# l_partkey = p_partkey
# and l_shipdate >= date '1995-09-01'
# and l_shipdate < date '1995-09-01' + interval '1' month;
-% sys.L5 # table_name
+% sys.%13 # table_name
% promo_revenue # name
% decimal # type
% 20 # length
@@ -742,7 +742,7 @@ stdout of test '01-22` in directory 'sql
# p_brand,
# p_type,
# p_size;
-% sys.part, sys.part, sys.part, sys.L11 # table_name
+% sys.part, sys.part, sys.part, sys.%2 # table_name
% p_brand, p_type, p_size, supplier_cnt # name
% char, varchar, int, bigint # type
% 10, 25, 2, 1 # length
@@ -1064,7 +1064,7 @@ stdout of test '01-22` in directory 'sql
# where
# l_partkey = p_partkey
# );
-% sys.L12 # table_name
+% sys.%24 # table_name
% avg_yearly # name
% decimal # type
% 20 # length
@@ -1107,8 +1107,8 @@ stdout of test '01-22` in directory 'sql
# o_totalprice desc,
# o_orderdate
#limit 100;
-% sys.customer, sys.customer, sys.orders, sys.orders,
sys.orders, sys.L14 # table_name
-% c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice,
L14 # name
+% sys.customer, sys.customer, sys.orders, sys.orders,
sys.orders, sys.%3 # table_name
+% c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice,
%3 # name
% varchar, int, int, date, decimal, decimal # type
% 18, 3, 5, 10, 17, 20 # length
[ "Customer#000000667", 667, 29158, 1995-10-21, 439687.23,
305.00 ]
@@ -1139,7 +1139,7 @@ stdout of test '01-22` in directory 'sql
# and p_brand = 'Brand#23'
# and p_container in ('MED BAG', 'MED BOX', 'MED PKG', 'MED PACK')
# and l_quantity >= 10 and l_quantity <= 10 + 10
-% sys.L22 # table_name
+% sys.%1 # table_name
% revenue # name
% decimal # type
% 20 # length
@@ -1186,7 +1186,7 @@ stdout of test '01-22` in directory 'sql
# l3.l_orderkey = l1.l_orderkey
# and l3.l_suppkey <> l1.l_suppkey
# and l3.l_receiptdate > l3.l_commitdate
-% sys.supplier, sys.L23 # table_name
+% sys.supplier, sys.%3 # table_name
% s_name, numwait # name
% char, bigint # type
% 25, 1 # length
@@ -1224,7 +1224,7 @@ stdout of test '01-22` in directory 'sql
# select
# *
# from
-% sys.custsale, sys.L20, sys.L23 # table_name
+% sys.custsale, sys.%3, sys.%4 # table_name
% cntrycode, numcust, totacctbal # name
% clob, bigint, decimal # type
% 2, 2, 20 # length
diff --git a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
--- a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
+++ b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
@@ -48,7 +48,7 @@ stdout of test '01-22` in directory 'sql
#order by
# l_returnflag,
# l_linestatus;
-% sys.lineitem, sys.lineitem, sys.L5, sys.L10, sys.L13,
sys.L16, sys.L21, sys.L24, sys.L27, sys.L32 #
table_name
+% sys.lineitem, sys.lineitem, sys.%1, sys.%2, sys.%3, sys.%4, sys.%5,
sys.%6, sys.%7, sys.%10 # table_name
% l_returnflag, l_linestatus, sum_qty, sum_base_price,
sum_disc_price, sum_charge, avg_qty, avg_price, avg_disc,
count_order # name
% char, char, decimal, decimal, decimal,
decimal, double, double, double, bigint # type
% 1, 1, 40, 40, 40, 40, 24, 24, 24, 5 #
length
@@ -93,7 +93,7 @@ stdout of test '01-22` in directory 'sql
# revenue desc,
# o_orderdate
#limit 10;
-% sys.lineitem, sys.L4, sys.orders, sys.orders # table_name
+% sys.lineitem, sys.%1, sys.orders, sys.orders # table_name
% l_orderkey, revenue, o_orderdate, o_shippriority # name
% int, decimal, date, int # type
% 5, 40, 10, 1 # length
@@ -133,7 +133,7 @@ stdout of test '01-22` in directory 'sql
# o_orderpriority
#order by
# o_orderpriority;
-% sys.orders, sys.L12 # table_name
+% sys.orders, sys.%2 # table_name
% o_orderpriority, order_count # name
% char, bigint # type
% 15, 3 # length
@@ -171,7 +171,7 @@ stdout of test '01-22` in directory 'sql
# n_name
#order by
# revenue desc;
-% sys.nation, sys.L4 # table_name
+% sys.nation, sys.%1 # table_name
% n_name, revenue # name
% char, decimal # type
% 25, 40 # length
@@ -194,7 +194,7 @@ stdout of test '01-22` in directory 'sql
# and l_shipdate < date '1994-01-01' + interval '1' year
# and l_discount between 0.06 - 0.01 and 0.06 + 0.01
# and l_quantity < 24;
-% sys.L4 # table_name
+% sys.%1 # table_name
% revenue # name
% decimal # type
% 40 # length
@@ -231,7 +231,7 @@ stdout of test '01-22` in directory 'sql
# and c_nationkey = n2.n_nationkey
# and (
# (n1.n_name = 'FRANCE' and n2.n_name = 'GERMANY')
-% sys.shipping, sys.shipping, sys.shipping, sys.L16 # table_name
+% sys.shipping, sys.shipping, sys.shipping, sys.%1 # table_name
% supp_nation, cust_nation, l_year, revenue # name
% char, char, int, decimal # type
% 25, 25, 4, 40 # length
@@ -272,7 +272,7 @@ stdout of test '01-22` in directory 'sql
# and o_custkey = c_custkey
# and c_nationkey = n1.n_nationkey
# and n1.n_regionkey = r_regionkey
-% sys.all_nations, sys.L14 # table_name
+% sys.all_nations, sys. # table_name
% o_year, mkt_share # name
% int, decimal # type
% 4, 40 # length
@@ -309,7 +309,7 @@ stdout of test '01-22` in directory 'sql
# and s_nationkey = n_nationkey
# and p_name like '%green%'
# ) as profit
-% sys.profit, sys.profit, sys.L13 # table_name
+% sys.profit, sys.profit, sys.%1 # table_name
% nation, o_year, sum_profit # name
% char, int, decimal # type
% 25, 4, 40 # length
@@ -523,7 +523,7 @@ stdout of test '01-22` in directory 'sql
#order by
# revenue desc
#limit 20;
-% sys.customer, sys.customer, sys.L5, sys.customer, sys.nation,
sys.customer, sys.customer, sys.customer # table_name
+% sys.customer, sys.customer, sys.%1, sys.customer, sys.nation,
sys.customer, sys.customer, sys.customer # table_name
% c_custkey, c_name, revenue, c_acctbal, n_name, c_address,
c_phone, c_comment # name
% int, varchar, decimal, decimal, char, varchar,
char, varchar # type
% 4, 18, 40, 17, 25, 40, 15, 116 # length
@@ -575,7 +575,7 @@ stdout of test '01-22` in directory 'sql
# from
# partsupp,
# supplier,
-% sys.partsupp, sys.L4 # table_name
+% sys.partsupp, sys.%1 # table_name
% ps_partkey, value # name
% int, decimal # type
% 4, 40 # length
@@ -609,7 +609,7 @@ stdout of test '01-22` in directory 'sql
# and l_shipdate < l_commitdate
# and l_receiptdate >= date '1994-01-01'
# and l_receiptdate < date '1994-01-01' + interval '1' year
-% sys.lineitem, sys.L4, sys.L7 # table_name
+% sys.lineitem, sys.%1, sys.%2 # table_name
% l_shipmode, high_line_count, low_line_count # name
% char, hugeint, hugeint # type
% 10, 2, 2 # length
@@ -640,7 +640,7 @@ stdout of test '01-22` in directory 'sql
#order by
# custdist desc,
# c_count desc;
-% .c_orders, .L7 # table_name
+% .c_orders, .%4 # table_name
% c_count, custdist # name
% bigint, bigint # type
% 2, 3 # length
@@ -695,7 +695,7 @@ stdout of test '01-22` in directory 'sql
# l_partkey = p_partkey
# and l_shipdate >= date '1995-09-01'
# and l_shipdate < date '1995-09-01' + interval '1' month;
-% sys.L5 # table_name
+% sys.%13 # table_name
% promo_revenue # name
% decimal # type
% 40 # length
@@ -742,7 +742,7 @@ stdout of test '01-22` in directory 'sql
# p_brand,
# p_type,
# p_size;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
