Changeset: 18299ec1ee47 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=18299ec1ee47 Modified Files: sql/benchmarks/ssbm/Tests/01-13.stable.out sql/benchmarks/ssbm/Tests/01-13.stable.out.int128 sql/benchmarks/ssbm/Tests/01.stable.out sql/benchmarks/ssbm/Tests/01.stable.out.int128 sql/benchmarks/ssbm/Tests/02.stable.out sql/benchmarks/ssbm/Tests/02.stable.out.int128 sql/benchmarks/ssbm/Tests/03.stable.out sql/benchmarks/ssbm/Tests/03.stable.out.int128 sql/benchmarks/ssbm/Tests/04.stable.out.int128 sql/benchmarks/ssbm/Tests/05.stable.out.int128 sql/benchmarks/ssbm/Tests/06.stable.out.int128 sql/benchmarks/ssbm/Tests/07.stable.out sql/benchmarks/ssbm/Tests/07.stable.out.int128 sql/benchmarks/ssbm/Tests/08.stable.out sql/benchmarks/ssbm/Tests/08.stable.out.int128 sql/benchmarks/ssbm/Tests/09.stable.out sql/benchmarks/ssbm/Tests/09.stable.out.int128 sql/benchmarks/ssbm/Tests/10.stable.out sql/benchmarks/ssbm/Tests/10.stable.out.int128 sql/benchmarks/ssbm/Tests/11.stable.out sql/benchmarks/ssbm/Tests/11.stable.out.int128 sql/benchmarks/ssbm/Tests/12.stable.out sql/benchmarks/ssbm/Tests/12.stable.out.int128 sql/benchmarks/ssbm/Tests/13.stable.out sql/benchmarks/ssbm/Tests/13.stable.out.int128 sql/benchmarks/ssbm/Tests/check1.stable.out sql/benchmarks/tpcds/Tests/02.stable.out sql/benchmarks/tpcds/Tests/02.stable.out.int128 sql/benchmarks/tpcds/Tests/03.stable.out sql/benchmarks/tpcds/Tests/03.stable.out.int128 sql/benchmarks/tpcds/Tests/06.stable.out sql/benchmarks/tpcds/Tests/07.stable.out sql/benchmarks/tpcds/Tests/09.stable.out sql/benchmarks/tpcds/Tests/10.stable.out sql/benchmarks/tpcds/Tests/12.stable.out sql/benchmarks/tpcds/Tests/12.stable.out.int128 sql/benchmarks/tpcds/Tests/13.stable.out sql/benchmarks/tpcds/Tests/13.stable.out.int128 sql/benchmarks/tpcds/Tests/14b.stable.out sql/benchmarks/tpcds/Tests/14b.stable.out.int128 sql/benchmarks/tpcds/Tests/15.stable.out sql/benchmarks/tpcds/Tests/15.stable.out.int128 sql/benchmarks/tpcds/Tests/16.stable.out sql/benchmarks/tpcds/Tests/16.stable.out.int128 sql/benchmarks/tpcds/Tests/17.stable.out sql/benchmarks/tpcds/Tests/19.stable.out sql/benchmarks/tpcds/Tests/19.stable.out.int128 sql/benchmarks/tpcds/Tests/20.stable.out sql/benchmarks/tpcds/Tests/20.stable.out.int128 sql/benchmarks/tpcds/Tests/23a.stable.out sql/benchmarks/tpcds/Tests/23a.stable.out.int128 sql/benchmarks/tpcds/Tests/24a.stable.out sql/benchmarks/tpcds/Tests/24a.stable.out.int128 sql/benchmarks/tpcds/Tests/24b.stable.out sql/benchmarks/tpcds/Tests/24b.stable.out.int128 sql/benchmarks/tpcds/Tests/25.stable.out sql/benchmarks/tpcds/Tests/25.stable.out.int128 sql/benchmarks/tpcds/Tests/26.stable.out sql/benchmarks/tpcds/Tests/29.stable.out sql/benchmarks/tpcds/Tests/29.stable.out.int128 sql/benchmarks/tpcds/Tests/31.stable.out sql/benchmarks/tpcds/Tests/31.stable.out.int128 sql/benchmarks/tpcds/Tests/32.stable.out sql/benchmarks/tpcds/Tests/32.stable.out.int128 sql/benchmarks/tpcds/Tests/33.stable.out sql/benchmarks/tpcds/Tests/33.stable.out.int128 sql/benchmarks/tpcds/Tests/35.stable.out sql/benchmarks/tpcds/Tests/36.stable.out sql/benchmarks/tpcds/Tests/36.stable.out.int128 sql/benchmarks/tpcds/Tests/38.stable.out sql/benchmarks/tpcds/Tests/38.stable.out.int128 sql/benchmarks/tpcds/Tests/40.stable.out sql/benchmarks/tpcds/Tests/40.stable.out.int128 sql/benchmarks/tpcds/Tests/42.stable.out sql/benchmarks/tpcds/Tests/42.stable.out.int128 sql/benchmarks/tpcds/Tests/43.stable.out sql/benchmarks/tpcds/Tests/43.stable.out.int128 sql/benchmarks/tpcds/Tests/44.stable.out sql/benchmarks/tpcds/Tests/45.stable.out sql/benchmarks/tpcds/Tests/45.stable.out.int128 sql/benchmarks/tpcds/Tests/48.stable.out.int128 sql/benchmarks/tpcds/Tests/50.stable.out sql/benchmarks/tpcds/Tests/50.stable.out.int128 sql/benchmarks/tpcds/Tests/52.stable.out sql/benchmarks/tpcds/Tests/52.stable.out.int128 sql/benchmarks/tpcds/Tests/54.stable.out sql/benchmarks/tpcds/Tests/55.stable.out sql/benchmarks/tpcds/Tests/55.stable.out.int128 sql/benchmarks/tpcds/Tests/56.stable.out sql/benchmarks/tpcds/Tests/56.stable.out.int128 sql/benchmarks/tpcds/Tests/58.stable.out sql/benchmarks/tpcds/Tests/58.stable.out.int128 sql/benchmarks/tpcds/Tests/59.stable.out sql/benchmarks/tpcds/Tests/59.stable.out.int128 sql/benchmarks/tpcds/Tests/60.stable.out sql/benchmarks/tpcds/Tests/60.stable.out.int128 sql/benchmarks/tpcds/Tests/61.stable.out sql/benchmarks/tpcds/Tests/61.stable.out.int128 sql/benchmarks/tpcds/Tests/62.stable.out sql/benchmarks/tpcds/Tests/62.stable.out.int128 sql/benchmarks/tpcds/Tests/64.stable.out sql/benchmarks/tpcds/Tests/64.stable.out.int128 sql/benchmarks/tpcds/Tests/66.stable.out sql/benchmarks/tpcds/Tests/66.stable.out.int128 sql/benchmarks/tpcds/Tests/69.stable.out sql/benchmarks/tpcds/Tests/70.stable.out sql/benchmarks/tpcds/Tests/70.stable.out.int128 sql/benchmarks/tpcds/Tests/71.stable.out sql/benchmarks/tpcds/Tests/71.stable.out.int128 sql/benchmarks/tpcds/Tests/72.stable.out sql/benchmarks/tpcds/Tests/72.stable.out.int128 sql/benchmarks/tpcds/Tests/75.stable.out sql/benchmarks/tpcds/Tests/75.stable.out.int128 sql/benchmarks/tpcds/Tests/76.stable.out sql/benchmarks/tpcds/Tests/76.stable.out.int128 sql/benchmarks/tpcds/Tests/78.stable.out sql/benchmarks/tpcds/Tests/78.stable.out.int128 sql/benchmarks/tpcds/Tests/79.stable.out sql/benchmarks/tpcds/Tests/79.stable.out.int128 sql/benchmarks/tpcds/Tests/83.stable.out sql/benchmarks/tpcds/Tests/83.stable.out.int128 sql/benchmarks/tpcds/Tests/84.stable.out sql/benchmarks/tpcds/Tests/85.stable.out sql/benchmarks/tpcds/Tests/86.stable.out sql/benchmarks/tpcds/Tests/86.stable.out.int128 sql/benchmarks/tpcds/Tests/87.stable.out sql/benchmarks/tpcds/Tests/87.stable.out.int128 sql/benchmarks/tpcds/Tests/90.stable.out sql/benchmarks/tpcds/Tests/90.stable.out.int128 sql/benchmarks/tpcds/Tests/91.stable.out sql/benchmarks/tpcds/Tests/91.stable.out.int128 sql/benchmarks/tpcds/Tests/92.stable.out sql/benchmarks/tpcds/Tests/92.stable.out.int128 sql/benchmarks/tpcds/Tests/93.stable.out sql/benchmarks/tpcds/Tests/93.stable.out.int128 sql/benchmarks/tpcds/Tests/94.stable.out sql/benchmarks/tpcds/Tests/94.stable.out.int128 sql/benchmarks/tpcds/Tests/96.stable.out sql/benchmarks/tpcds/Tests/97.stable.out sql/benchmarks/tpcds/Tests/97.stable.out.int128 sql/benchmarks/tpcds/Tests/98.stable.out sql/benchmarks/tpcds/Tests/98.stable.out.int128 sql/benchmarks/tpcds/Tests/99.stable.out sql/benchmarks/tpcds/Tests/99.stable.out.int128 sql/benchmarks/tpcds/Tests/check1.stable.out sql/benchmarks/tpch/LOCKED/Tests/check1.stable.out sql/benchmarks/tpch/Tests/check1.stable.out Branch: sq2default Log Message:
approved output diffs (truncated from 3022 to 300 lines): diff --git a/sql/benchmarks/ssbm/Tests/01-13.stable.out b/sql/benchmarks/ssbm/Tests/01-13.stable.out --- a/sql/benchmarks/ssbm/Tests/01-13.stable.out +++ b/sql/benchmarks/ssbm/Tests/01-13.stable.out @@ -33,7 +33,7 @@ stdout of test '01-13` in directory 'sql # and d_year = 1993 # and lo_discount between 1 and 3 # and lo_quantity < 25; -% sys.L4 # table_name +% sys.%1 # table_name % revenue # name % bigint # type % 10 # length @@ -49,7 +49,7 @@ stdout of test '01-13` in directory 'sql # and d_yearmonthnum = 199401 # and lo_discount between 4 and 6 # and lo_quantity between 26 and 35; -% sys.L4 # table_name +% sys.%1 # table_name % revenue # name % bigint # type % 9 # length @@ -65,7 +65,7 @@ stdout of test '01-13` in directory 'sql # and d_weeknuminyear = 6 and d_year = 1994 # and lo_discount between 5 and 7 # and lo_quantity between 36 and 40; -% sys.L4 # table_name +% sys.%1 # table_name % revenue # name % bigint # type % 9 # length @@ -350,7 +350,7 @@ stdout of test '01-13` in directory 'sql # and d_year >= 1992 and d_year <= 1997 # group by c_nation, s_nation, d_year # order by d_year asc, revenue desc; -% sys.customer, sys.supplier, sys.dwdate, sys.L6 # table_name +% sys.customer, sys.supplier, sys.dwdate, sys.%1 # table_name % c_nation, s_nation, d_year, revenue # name % clob, clob, int, bigint # type % 9, 9, 4, 9 # length @@ -519,7 +519,7 @@ stdout of test '01-13` in directory 'sql # and d_year >= 1992 and d_year <= 1997 # group by c_city, s_city, d_year # order by d_year asc, revenue desc; -% sys.customer, sys.supplier, sys.dwdate, sys.L6 # table_name +% sys.customer, sys.supplier, sys.dwdate, sys.%1 # table_name % c_city, s_city, d_year, revenue # name % clob, clob, int, bigint # type % 0, 0, 1, 1 # length @@ -540,7 +540,7 @@ stdout of test '01-13` in directory 'sql # and d_year >= 1992 and d_year <= 1997 # group by c_city, s_city, d_year # order by d_year asc, revenue desc; -% sys.customer, sys.supplier, sys.dwdate, sys.L6 # table_name +% sys.customer, sys.supplier, sys.dwdate, sys.%1 # table_name % c_city, s_city, d_year, revenue # name % clob, clob, int, bigint # type % 0, 0, 1, 1 # length @@ -561,7 +561,7 @@ stdout of test '01-13` in directory 'sql # and d_yearmonth = 'Dec1997' # group by c_city, s_city, d_year # order by d_year asc, revenue desc; -% sys.customer, sys.supplier, sys.dwdate, sys.L6 # table_name +% sys.customer, sys.supplier, sys.dwdate, sys.%1 # table_name % c_city, s_city, d_year, revenue # name % clob, clob, int, bigint # type % 0, 0, 1, 1 # length @@ -581,7 +581,7 @@ stdout of test '01-13` in directory 'sql # and (p_mfgr = 'MFGR#1' or p_mfgr = 'MFGR#2') # group by d_year, c_nation # order by d_year, c_nation; -% sys.dwdate, sys.customer, sys.L5 # table_name +% sys.dwdate, sys.customer, sys.%1 # table_name % d_year, c_nation, profit1 # name % int, clob, bigint # type % 4, 9, 9 # length @@ -630,7 +630,7 @@ stdout of test '01-13` in directory 'sql # 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; -% sys.dwdate, sys.supplier, sys.part, sys.L6 # table_name +% sys.dwdate, sys.supplier, sys.part, sys.%1 # table_name % d_year, s_nation, p_category, profit1 # name % int, clob, clob, bigint # type % 4, 13, 7, 8 # length @@ -727,7 +727,7 @@ stdout of test '01-13` in directory 'sql # and p_category = 'MFGR#14' # group by d_year, s_city, p_brand1 # order by d_year, s_city, p_brand1; -% sys.dwdate, sys.supplier, sys.part, sys.L6 # table_name +% sys.dwdate, sys.supplier, sys.part, sys.%1 # table_name % d_year, s_city, p_brand1, profit1 # name % int, clob, clob, bigint # type % 4, 10, 9, 7 # length diff --git a/sql/benchmarks/ssbm/Tests/01-13.stable.out.int128 b/sql/benchmarks/ssbm/Tests/01-13.stable.out.int128 --- a/sql/benchmarks/ssbm/Tests/01-13.stable.out.int128 +++ b/sql/benchmarks/ssbm/Tests/01-13.stable.out.int128 @@ -33,7 +33,7 @@ stdout of test '01-13` in directory 'sql # and d_year = 1993 # and lo_discount between 1 and 3 # and lo_quantity < 25; -% sys.L4 # table_name +% sys.%1 # table_name % revenue # name % hugeint # type % 10 # length @@ -49,7 +49,7 @@ stdout of test '01-13` in directory 'sql # and d_yearmonthnum = 199401 # and lo_discount between 4 and 6 # and lo_quantity between 26 and 35; -% sys.L4 # table_name +% sys.%1 # table_name % revenue # name % hugeint # type % 9 # length @@ -65,7 +65,7 @@ stdout of test '01-13` in directory 'sql # and d_weeknuminyear = 6 and d_year = 1994 # and lo_discount between 5 and 7 # and lo_quantity between 36 and 40; -% sys.L4 # table_name +% sys.%1 # table_name % revenue # name % hugeint # type % 9 # length @@ -84,8 +84,8 @@ stdout of test '01-13` in directory 'sql # and s_region = 'AMERICA' # group by d_year, p_brand1 # order by d_year, p_brand1; -% sys.L3, sys.dwdate, sys.part # table_name -% L2, d_year, p_brand1 # name +% sys.%1, sys.dwdate, sys.part # table_name +% %1, d_year, p_brand1 # name % hugeint, int, clob # type % 8, 4, 9 # length [ 35741623, 1992, "MFGR#1211" ] @@ -259,8 +259,8 @@ stdout of test '01-13` in directory 'sql # and s_region = 'ASIA' # group by d_year, p_brand1 # order by d_year, p_brand1; -% sys.L3, sys.dwdate, sys.part # table_name -% L2, d_year, p_brand1 # name +% sys.%1, sys.dwdate, sys.part # table_name +% %1, d_year, p_brand1 # name % hugeint, int, clob # type % 8, 4, 9 # length [ 10306232, 1992, "MFGR#2221" ] @@ -324,8 +324,8 @@ stdout of test '01-13` in directory 'sql # and s_region = 'EUROPE' # group by d_year, p_brand1 # order by d_year, p_brand1; -% sys.L3, sys.dwdate, sys.part # table_name -% L2, d_year, p_brand1 # name +% sys.%1, sys.dwdate, sys.part # table_name +% %1, d_year, p_brand1 # name % hugeint, int, clob # type % 8, 4, 9 # length [ 2535744, 1992, "MFGR#2221" ] @@ -350,7 +350,7 @@ stdout of test '01-13` in directory 'sql # and d_year >= 1992 and d_year <= 1997 # group by c_nation, s_nation, d_year # order by d_year asc, revenue desc; -% sys.customer, sys.supplier, sys.dwdate, sys.L6 # table_name +% sys.customer, sys.supplier, sys.dwdate, sys.%1 # table_name % c_nation, s_nation, d_year, revenue # name % clob, clob, int, hugeint # type % 9, 9, 4, 9 # length @@ -519,7 +519,7 @@ stdout of test '01-13` in directory 'sql # and d_year >= 1992 and d_year <= 1997 # group by c_city, s_city, d_year # order by d_year asc, revenue desc; -% sys.customer, sys.supplier, sys.dwdate, sys.L6 # table_name +% sys.customer, sys.supplier, sys.dwdate, sys.%1 # table_name % c_city, s_city, d_year, revenue # name % clob, clob, int, hugeint # type % 0, 0, 1, 1 # length @@ -540,7 +540,7 @@ stdout of test '01-13` in directory 'sql # and d_year >= 1992 and d_year <= 1997 # group by c_city, s_city, d_year # order by d_year asc, revenue desc; -% sys.customer, sys.supplier, sys.dwdate, sys.L6 # table_name +% sys.customer, sys.supplier, sys.dwdate, sys.%1 # table_name % c_city, s_city, d_year, revenue # name % clob, clob, int, hugeint # type % 0, 0, 1, 1 # length @@ -561,7 +561,7 @@ stdout of test '01-13` in directory 'sql # and d_yearmonth = 'Dec1997' # group by c_city, s_city, d_year # order by d_year asc, revenue desc; -% sys.customer, sys.supplier, sys.dwdate, sys.L6 # table_name +% sys.customer, sys.supplier, sys.dwdate, sys.%1 # table_name % c_city, s_city, d_year, revenue # name % clob, clob, int, hugeint # type % 0, 0, 1, 1 # length @@ -581,7 +581,7 @@ stdout of test '01-13` in directory 'sql # and (p_mfgr = 'MFGR#1' or p_mfgr = 'MFGR#2') # group by d_year, c_nation # order by d_year, c_nation; -% sys.dwdate, sys.customer, sys.L5 # table_name +% sys.dwdate, sys.customer, sys.%1 # table_name % d_year, c_nation, profit1 # name % int, clob, bigint # type % 4, 9, 9 # length @@ -630,7 +630,7 @@ stdout of test '01-13` in directory 'sql # 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; -% sys.dwdate, sys.supplier, sys.part, sys.L6 # table_name +% sys.dwdate, sys.supplier, sys.part, sys.%1 # table_name % d_year, s_nation, p_category, profit1 # name % int, clob, clob, bigint # type % 4, 13, 7, 8 # length @@ -727,7 +727,7 @@ stdout of test '01-13` in directory 'sql # and p_category = 'MFGR#14' # group by d_year, s_city, p_brand1 # order by d_year, s_city, p_brand1; -% sys.dwdate, sys.supplier, sys.part, sys.L6 # table_name +% sys.dwdate, sys.supplier, sys.part, sys.%1 # table_name % d_year, s_city, p_brand1, profit1 # name % int, clob, clob, bigint # type % 4, 10, 9, 7 # length diff --git a/sql/benchmarks/ssbm/Tests/01.stable.out b/sql/benchmarks/ssbm/Tests/01.stable.out --- a/sql/benchmarks/ssbm/Tests/01.stable.out +++ b/sql/benchmarks/ssbm/Tests/01.stable.out @@ -28,7 +28,7 @@ stdout of test '01` in directory 'sql/be # and d_year = 1993 # and lo_discount between 1 and 3 # and lo_quantity < 25; -% sys.L4 # table_name +% sys.%1 # table_name % revenue # name % bigint # type % 10 # length diff --git a/sql/benchmarks/ssbm/Tests/01.stable.out.int128 b/sql/benchmarks/ssbm/Tests/01.stable.out.int128 --- a/sql/benchmarks/ssbm/Tests/01.stable.out.int128 +++ b/sql/benchmarks/ssbm/Tests/01.stable.out.int128 @@ -28,7 +28,7 @@ stdout of test '01` in directory 'sql/be # and d_year = 1993 # and lo_discount between 1 and 3 # and lo_quantity < 25; -% sys.L4 # table_name +% sys.%1 # table_name % revenue # name % hugeint # type % 10 # length diff --git a/sql/benchmarks/ssbm/Tests/02.stable.out b/sql/benchmarks/ssbm/Tests/02.stable.out --- a/sql/benchmarks/ssbm/Tests/02.stable.out +++ b/sql/benchmarks/ssbm/Tests/02.stable.out @@ -28,7 +28,7 @@ stdout of test '02` in directory 'sql/be # and d_yearmonthnum = 199401 # and lo_discount between 4 and 6 # and lo_quantity between 26 and 35; -% sys.L4 # table_name +% sys.%1 # table_name % revenue # name % bigint # type % 9 # length diff --git a/sql/benchmarks/ssbm/Tests/02.stable.out.int128 b/sql/benchmarks/ssbm/Tests/02.stable.out.int128 --- a/sql/benchmarks/ssbm/Tests/02.stable.out.int128 +++ b/sql/benchmarks/ssbm/Tests/02.stable.out.int128 @@ -28,7 +28,7 @@ stdout of test '02` in directory 'sql/be # and d_yearmonthnum = 199401 # and lo_discount between 4 and 6 # and lo_quantity between 26 and 35; -% sys.L4 # table_name +% sys.%1 # table_name % revenue # name % hugeint # type % 9 # length diff --git a/sql/benchmarks/ssbm/Tests/03.stable.out b/sql/benchmarks/ssbm/Tests/03.stable.out --- a/sql/benchmarks/ssbm/Tests/03.stable.out +++ b/sql/benchmarks/ssbm/Tests/03.stable.out @@ -28,7 +28,7 @@ stdout of test '03` in directory 'sql/be # and d_weeknuminyear = 6 and d_year = 1994 # and lo_discount between 5 and 7 # and lo_quantity between 36 and 40; -% sys.L4 # table_name +% sys.%1 # table_name % revenue # name % bigint # type % 9 # length diff --git a/sql/benchmarks/ssbm/Tests/03.stable.out.int128 b/sql/benchmarks/ssbm/Tests/03.stable.out.int128 --- a/sql/benchmarks/ssbm/Tests/03.stable.out.int128 +++ b/sql/benchmarks/ssbm/Tests/03.stable.out.int128 @@ -28,7 +28,7 @@ stdout of test '03` in directory 'sql/be # and d_weeknuminyear = 6 and d_year = 1994 # and lo_discount between 5 and 7 # and lo_quantity between 36 and 40; -% sys.L4 # table_name +% sys.%1 # table_name % revenue # name % hugeint # type % 9 # length diff --git a/sql/benchmarks/ssbm/Tests/04.stable.out.int128 b/sql/benchmarks/ssbm/Tests/04.stable.out.int128 --- a/sql/benchmarks/ssbm/Tests/04.stable.out.int128 +++ b/sql/benchmarks/ssbm/Tests/04.stable.out.int128 @@ -31,8 +31,8 @@ stdout of test '04` in directory 'sql/be # and s_region = 'AMERICA' # group by d_year, p_brand1 # order by d_year, p_brand1; -% sys.L3, sys.dwdate, sys.part # table_name -% L2, d_year, p_brand1 # name _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
