Changeset: 98a2de07c941 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98a2de07c941 Modified Files: sql/benchmarks/ATIS/Tests/select_group.stable.out sql/benchmarks/ssbm/Tests/01-13.stable.out sql/benchmarks/ssbm/Tests/04.stable.out sql/benchmarks/ssbm/Tests/05.stable.out sql/benchmarks/ssbm/Tests/06.stable.out sql/benchmarks/tpch/LOCKED/Tests/12.stable.out sql/benchmarks/tpch/LOCKED/Tests/18.stable.out sql/benchmarks/tpch/LOCKED/Tests/19.stable.out sql/benchmarks/tpch/Tests/12.stable.out sql/benchmarks/tpch/Tests/18.stable.out sql/benchmarks/tpch/Tests/19.stable.out sql/jdbc/tests/Tests/Test_PSmetadata.stable.out sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.out sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.stable.out sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out sql/test/BugTracker-2017/Tests/All sql/test/BugTracker-2018/Tests/All sql/test/BugTracker-2019/Tests/All sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.stable.out sql/test/BugTracker/Tests/case_with_aggr.SF-1876779.stable.out sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/Tests/window_functions.stable.out sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Windows sql/test/mergetables/Tests/All sql/test/mergetables/Tests/forex.stable.out sql/test/pg_regress/Tests/int4.stable.out sql/test/pg_regress/Tests/int8.stable.out sql/test/pg_regress/Tests/interval.stable.out sql/test/subquery/Tests/All sql/test/subquery/Tests/subquery2.sql sql/test/subquery/Tests/subquery2.stable.out sql/test/subquery/Tests/subquery3.sql sql/test/subquery/Tests/subquery3.stable.out Branch: sq2default Log Message:
Non 128-bit tests approval and remove KNOWFAIL remark for some tests that now give right output diffs (truncated from 3418 to 300 lines): diff --git a/sql/benchmarks/ATIS/Tests/select_group.stable.out b/sql/benchmarks/ATIS/Tests/select_group.stable.out --- a/sql/benchmarks/ATIS/Tests/select_group.stable.out +++ b/sql/benchmarks/ATIS/Tests/select_group.stable.out @@ -63,68 +63,68 @@ stdout of test 'select_group` in directo [ "SATURDAY", 6, 64 ] [ "SUNDAY", 7, 64 ] #select sum(engines) from aircraft; -% sys.L4 # table_name -% L3 # name +% sys.%1 # table_name +% %1 # name % decimal # type % 19 # length [ 278 ] #select avg(engines) from aircraft; -% sys.L4 # table_name -% L3 # name +% sys.%1 # table_name +% %1 # name % double # type % 24 # length [ 2.059259259 ] #select avg(engines) from aircraft where engines>0; -% sys.L4 # table_name -% L3 # name +% sys.%1 # table_name +% %1 # name % double # type % 24 # length [ 2.376068376 ] #select count(*),min(pay_load),max(pay_load) from aircraft where pay_load>0; -% sys.L4, sys.L7, sys.L12 # table_name -% L3, L6, L11 # name +% sys.%1, sys.%2, sys.%3 # table_name +% %1, %2, %3 # name % bigint, int, int # type % 2, 3, 6 # length [ 94, 240, 165710 ] #select min(flight_code),min(flight_code) from flight; -% sys.L4, sys.L7 # table_name -% L3, L6 # name +% sys.%1, sys.%2 # table_name +% %1, %2 # name % int, int # type % 6, 6 # length [ 101908, 101908 ] #select min(from_airport),min(to_airport) from flight; -% sys.L4, sys.L7 # table_name -% L3, L6 # name +% sys.%1, sys.%2 # table_name +% %1, %2 # name % char, char # type % 3, 3 # length [ "ATL", "ATL" ] #select count(*) from aircraft where pay_load>10000; -% sys.L4 # table_name -% L3 # name +% sys.%1 # table_name +% %1 # name % bigint # type % 2 # length [ 50 ] #select count(*) from aircraft where pay_load<>0; -% sys.L4 # table_name -% L3 # name +% sys.%1 # table_name +% %1 # name % bigint # type % 2 # length [ 94 ] #select count(*) from flight where flight_code >= 112793; -% sys.L4 # table_name -% L3 # name +% sys.%1 # table_name +% %1 # name % bigint # type % 3 # length [ 279 ] #SELECT from_airport,to_airport,avg(time_elapsed) FROM flight WHERE from_airport='ATL' AND to_airport='BOS' group by from_airport,to_airport; -% sys.flight, sys.flight, sys.L5 # table_name -% from_airport, to_airport, L4 # name +% sys.flight, sys.flight, sys.%1 # table_name +% from_airport, to_airport, %1 # name % char, char, double # type % 3, 3, 24 # length [ "ATL", "BOS", 154.3684211 ] #select city_code, avg(ground_fare) from ground_service where ground_fare<>0 group by city_code; -% sys.ground_service, sys.L4 # table_name -% city_code, L3 # name +% sys.ground_service, sys.%1 # table_name +% city_code, %1 # name % char, double # type % 4, 24 # length [ "MATL", 9 ] 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 @@ -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 % bigint, 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 % bigint, 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 % bigint, int, clob # type % 8, 4, 9 # length [ 2535744, 1992, "MFGR#2221" ] diff --git a/sql/benchmarks/ssbm/Tests/04.stable.out b/sql/benchmarks/ssbm/Tests/04.stable.out --- a/sql/benchmarks/ssbm/Tests/04.stable.out +++ b/sql/benchmarks/ssbm/Tests/04.stable.out @@ -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 +% sys.%1, sys.dwdate, sys.part # table_name +% %1, d_year, p_brand1 # name % bigint, int, clob # type % 8, 4, 9 # length [ 35741623, 1992, "MFGR#1211" ] diff --git a/sql/benchmarks/ssbm/Tests/05.stable.out b/sql/benchmarks/ssbm/Tests/05.stable.out --- a/sql/benchmarks/ssbm/Tests/05.stable.out +++ b/sql/benchmarks/ssbm/Tests/05.stable.out @@ -33,8 +33,8 @@ stdout of test '05` in directory 'sql/be # 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 % bigint, int, clob # type % 8, 4, 9 # length [ 10306232, 1992, "MFGR#2221" ] diff --git a/sql/benchmarks/ssbm/Tests/06.stable.out b/sql/benchmarks/ssbm/Tests/06.stable.out --- a/sql/benchmarks/ssbm/Tests/06.stable.out +++ b/sql/benchmarks/ssbm/Tests/06.stable.out @@ -33,8 +33,8 @@ stdout of test '06` in directory 'sql/be # 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 % bigint, int, clob # type % 8, 4, 9 # length [ 2535744, 1992, "MFGR#2221" ] diff --git a/sql/benchmarks/tpch/LOCKED/Tests/12.stable.out b/sql/benchmarks/tpch/LOCKED/Tests/12.stable.out --- a/sql/benchmarks/tpch/LOCKED/Tests/12.stable.out +++ b/sql/benchmarks/tpch/LOCKED/Tests/12.stable.out @@ -51,7 +51,7 @@ stdout of test '12` in directory 'sql/be # 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.L6, sys.L11 # 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 diff --git a/sql/benchmarks/tpch/LOCKED/Tests/18.stable.out b/sql/benchmarks/tpch/LOCKED/Tests/18.stable.out --- a/sql/benchmarks/tpch/LOCKED/Tests/18.stable.out +++ b/sql/benchmarks/tpch/LOCKED/Tests/18.stable.out @@ -59,8 +59,8 @@ stdout of test '18` in directory 'sql/be # o_totalprice desc, # o_orderdate #limit 100; -% sys.customer, sys.customer, sys.orders, sys.orders, sys.orders, sys.L17 # table_name -% c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice, L16 # 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 ] diff --git a/sql/benchmarks/tpch/LOCKED/Tests/19.stable.out b/sql/benchmarks/tpch/LOCKED/Tests/19.stable.out --- a/sql/benchmarks/tpch/LOCKED/Tests/19.stable.out +++ b/sql/benchmarks/tpch/LOCKED/Tests/19.stable.out @@ -48,7 +48,7 @@ stdout of test '19` in directory 'sql/be # 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.L33 # table_name +% sys.%1 # table_name % revenue # name % decimal # type % 20 # length diff --git a/sql/benchmarks/tpch/Tests/12.stable.out b/sql/benchmarks/tpch/Tests/12.stable.out --- a/sql/benchmarks/tpch/Tests/12.stable.out +++ b/sql/benchmarks/tpch/Tests/12.stable.out @@ -51,7 +51,7 @@ stdout of test '12` in directory 'sql/be # 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.L6, sys.L11 # 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 diff --git a/sql/benchmarks/tpch/Tests/18.stable.out b/sql/benchmarks/tpch/Tests/18.stable.out --- a/sql/benchmarks/tpch/Tests/18.stable.out +++ b/sql/benchmarks/tpch/Tests/18.stable.out @@ -59,8 +59,8 @@ stdout of test '18` in directory 'sql/be # o_totalprice desc, # o_orderdate #limit 100; -% sys.customer, sys.customer, sys.orders, sys.orders, sys.orders, sys.L17 # table_name -% c_name, c_custkey, o_orderkey, o_orderdate, o_totalprice, L16 # 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 ] diff --git a/sql/benchmarks/tpch/Tests/19.stable.out b/sql/benchmarks/tpch/Tests/19.stable.out --- a/sql/benchmarks/tpch/Tests/19.stable.out +++ b/sql/benchmarks/tpch/Tests/19.stable.out @@ -48,7 +48,7 @@ stdout of test '19` in directory 'sql/be # 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.L33 # table_name +% sys.%1 # table_name % revenue # name % decimal # type % 20 # length diff --git a/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out b/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out --- a/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out +++ b/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out @@ -61,7 +61,7 @@ 1. null precision 8 scale 0 schemaname - tablename L1 + tablename %2 autoincrement false casesensitive false currency false diff --git a/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out b/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out --- a/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out +++ b/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out @@ -25,8 +25,8 @@ stdout of test 'groupby_with_NULL.SF-215 [ 1 ] [ 1 ] #select color, null, cast( sum(count) as bigint) from testola group by color; -% sys.testola, .%4, sys.%2 # table_name -% color, %4, %2 # name +% sys.testola, ., sys.%2 # table_name +% color, single_value, %2 # name % varchar, char, bigint # type % 4, 0, 2 # length [ "blue", NULL, 12 ] diff --git a/sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.out b/sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.out --- a/sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.out +++ b/sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.out @@ -24,15 +24,15 @@ stdout of test 'bit_and.SF-2850341` in d # 22:31:14 > #select bit_and(3749090034127126942, -1); -% .L1 # table_name -% L1 # name +% .%1 # table_name +% %1 # name % bigint # type % 19 # length [ 3749090034127126942 ] #select bit_and(3749090034127126942, 0x7fffffffffffffff); -% .L1 # table_name -% L1 # name +% .%1 # table_name +% %1 # name % bigint # type % 19 # length [ 3749090034127126942 ] diff --git a/sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out b/sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out --- a/sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out +++ b/sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list