Changeset: 461f6af0705a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=461f6af0705a Modified Files: sql/benchmarks/ssbm/Tests/01-plan.stable.out sql/benchmarks/ssbm/Tests/02-plan.stable.out sql/benchmarks/ssbm/Tests/03-plan.stable.out sql/benchmarks/ssbm/Tests/04-plan.stable.out sql/benchmarks/ssbm/Tests/05-plan.stable.out sql/benchmarks/ssbm/Tests/06-plan.stable.out sql/benchmarks/ssbm/Tests/07-plan.stable.out sql/benchmarks/ssbm/Tests/08-plan.stable.out sql/benchmarks/ssbm/Tests/09-plan.stable.out sql/benchmarks/ssbm/Tests/10-plan.stable.out sql/benchmarks/ssbm/Tests/11-plan.stable.out sql/benchmarks/ssbm/Tests/12-plan.stable.out sql/benchmarks/ssbm/Tests/13-plan.stable.out sql/benchmarks/tpch/Tests/02-plan.stable.out sql/benchmarks/tpch/Tests/03-plan.stable.out sql/benchmarks/tpch/Tests/03-plan.stable.out.int128 sql/benchmarks/tpch/Tests/05-plan.stable.out sql/benchmarks/tpch/Tests/05-plan.stable.out.int128 sql/benchmarks/tpch/Tests/07-plan.stable.out.int128 sql/benchmarks/tpch/Tests/08-plan.stable.out sql/benchmarks/tpch/Tests/08-plan.stable.out.int128 sql/benchmarks/tpch/Tests/09-plan.stable.out sql/benchmarks/tpch/Tests/09-plan.stable.out.int128 sql/benchmarks/tpch/Tests/11-plan.stable.out sql/benchmarks/tpch/Tests/11-plan.stable.out.int128 sql/benchmarks/tpch/Tests/12-plan.stable.out sql/benchmarks/tpch/Tests/13-plan.stable.out sql/benchmarks/tpch/Tests/14-plan.stable.out.int128 sql/benchmarks/tpch/Tests/16-plan.stable.out sql/benchmarks/tpch/Tests/17-plan.stable.out sql/benchmarks/tpch/Tests/17-plan.stable.out.int128 sql/benchmarks/tpch/Tests/19-plan.stable.out.int128 sql/benchmarks/tpch/Tests/20-plan.stable.out sql/benchmarks/tpch/Tests/20-plan.stable.out.int128 sql/benchmarks/tpch/Tests/21-plan.stable.out sql/benchmarks/tpch/Tests/22-plan.stable.out sql/server/rel_optimizer.c sql/server/rel_select.c sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128 sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/Triggers/trigger_activation.sql Branch: default Log Message:
use inplace converts also for atom's within the sql_exp (not only for atom's on the sql stack). This aligns behaviour with or without caching. diffs (truncated from 955 to 300 lines): diff --git a/sql/benchmarks/ssbm/Tests/01-plan.stable.out b/sql/benchmarks/ssbm/Tests/01-plan.stable.out --- a/sql/benchmarks/ssbm/Tests/01-plan.stable.out +++ b/sql/benchmarks/ssbm/Tests/01-plan.stable.out @@ -41,10 +41,10 @@ project ( | | join ( | | | select ( | | | | table(sys.lineorder) [ lineorder.lo_quantity, lineorder.lo_extendedprice, lineorder.lo_discount, lineorder.%lineorder_lo_orderdate_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey ] COUNT -| | | ) [ int[tinyint "1"] <= lineorder.lo_discount <= int[tinyint "3"], lineorder.lo_quantity < int[tinyint "25"] ], +| | | ) [ int "1" <= lineorder.lo_discount <= int "3", lineorder.lo_quantity < int "25" ], | | | select ( | | | | table(sys.dwdate) [ dwdate.d_year, dwdate.%TID% NOT NULL ] COUNT -| | | ) [ dwdate.d_year = int[smallint "1993"] ] +| | | ) [ dwdate.d_year = int "1993" ] | | ) [ lineorder.%lineorder_lo_orderdate_fkey NOT NULL = dwdate.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey ] | ) [ ] [ sys.sum no nil (sys.sql_mul(bigint[lineorder.lo_extendedprice] as lineorder.lo_extendedprice, lineorder.lo_discount)) as L1.L1 ] ) [ L1 as L1.revenue ] diff --git a/sql/benchmarks/ssbm/Tests/02-plan.stable.out b/sql/benchmarks/ssbm/Tests/02-plan.stable.out --- a/sql/benchmarks/ssbm/Tests/02-plan.stable.out +++ b/sql/benchmarks/ssbm/Tests/02-plan.stable.out @@ -41,7 +41,7 @@ project ( | | join ( | | | select ( | | | | table(sys.lineorder) [ lineorder.lo_quantity, lineorder.lo_extendedprice, lineorder.lo_discount, lineorder.%lineorder_lo_orderdate_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey ] COUNT -| | | ) [ int[tinyint "4"] <= lineorder.lo_discount <= int[tinyint "6"], int[tinyint "26"] <= lineorder.lo_quantity <= int[tinyint "35"] ], +| | | ) [ int "4" <= lineorder.lo_discount <= int "6", int "26" <= lineorder.lo_quantity <= int "35" ], | | | select ( | | | | table(sys.dwdate) [ dwdate.d_yearmonthnum, dwdate.%TID% NOT NULL ] COUNT | | | ) [ dwdate.d_yearmonthnum = int "199401" ] diff --git a/sql/benchmarks/ssbm/Tests/03-plan.stable.out b/sql/benchmarks/ssbm/Tests/03-plan.stable.out --- a/sql/benchmarks/ssbm/Tests/03-plan.stable.out +++ b/sql/benchmarks/ssbm/Tests/03-plan.stable.out @@ -41,10 +41,10 @@ project ( | | join ( | | | select ( | | | | table(sys.lineorder) [ lineorder.lo_quantity, lineorder.lo_extendedprice, lineorder.lo_discount, lineorder.%lineorder_lo_orderdate_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey ] COUNT -| | | ) [ int[tinyint "5"] <= lineorder.lo_discount <= int[tinyint "7"], int[tinyint "36"] <= lineorder.lo_quantity <= int[tinyint "40"] ], +| | | ) [ int "5" <= lineorder.lo_discount <= int "7", int "36" <= lineorder.lo_quantity <= int "40" ], | | | select ( | | | | table(sys.dwdate) [ dwdate.d_year, dwdate.d_weeknuminyear, dwdate.%TID% NOT NULL ] COUNT -| | | ) [ dwdate.d_year = int[smallint "1994"], dwdate.d_weeknuminyear = int[tinyint "6"] ] +| | | ) [ dwdate.d_year = int "1994", dwdate.d_weeknuminyear = int "6" ] | | ) [ lineorder.%lineorder_lo_orderdate_fkey NOT NULL = dwdate.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey ] | ) [ ] [ sys.sum no nil (sys.sql_mul(bigint[lineorder.lo_extendedprice] as lineorder.lo_extendedprice, lineorder.lo_discount)) as L1.L1 ] ) [ L1 as L1.revenue ] diff --git a/sql/benchmarks/ssbm/Tests/04-plan.stable.out b/sql/benchmarks/ssbm/Tests/04-plan.stable.out --- a/sql/benchmarks/ssbm/Tests/04-plan.stable.out +++ b/sql/benchmarks/ssbm/Tests/04-plan.stable.out @@ -47,11 +47,11 @@ project ( | | | | | table(sys.lineorder) [ lineorder.lo_revenue, lineorder.%lineorder_lo_orderdate_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey, lineorder.%lineorder_lo_suppkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey, lineorder.%lineorder_lo_partkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_partkey_fkey ] COUNT , | | | | | select ( | | | | | | table(sys.part) [ part.p_category, part.p_brand1, part.%TID% NOT NULL ] COUNT -| | | | | ) [ part.p_category = clob[char(7) "MFGR#12"] ] +| | | | | ) [ part.p_category = clob "MFGR#12" ] | | | | ) [ lineorder.%lineorder_lo_partkey_fkey NOT NULL = part.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_partkey_fkey ], | | | | select ( | | | | | table(sys.supplier) [ supplier.s_region, supplier.%TID% NOT NULL ] COUNT -| | | | ) [ supplier.s_region = clob[char(7) "AMERICA"] ] +| | | | ) [ supplier.s_region = clob "AMERICA" ] | | | ) [ lineorder.%lineorder_lo_suppkey_fkey NOT NULL = supplier.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey ], | | | table(sys.dwdate) [ dwdate.d_year, dwdate.%TID% NOT NULL ] COUNT | | ) [ lineorder.%lineorder_lo_orderdate_fkey NOT NULL = dwdate.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey ] diff --git a/sql/benchmarks/ssbm/Tests/05-plan.stable.out b/sql/benchmarks/ssbm/Tests/05-plan.stable.out --- a/sql/benchmarks/ssbm/Tests/05-plan.stable.out +++ b/sql/benchmarks/ssbm/Tests/05-plan.stable.out @@ -49,11 +49,11 @@ project ( | | | | | table(sys.lineorder) [ lineorder.lo_revenue, lineorder.%lineorder_lo_orderdate_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey, lineorder.%lineorder_lo_suppkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey, lineorder.%lineorder_lo_partkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_partkey_fkey ] COUNT , | | | | | select ( | | | | | | table(sys.part) [ part.p_brand1, part.%TID% NOT NULL ] COUNT -| | | | | ) [ clob[char(9) "MFGR#2221"] <= part.p_brand1 <= clob[char(9) "MFGR#2228"] ] +| | | | | ) [ clob "MFGR#2221" <= part.p_brand1 <= clob "MFGR#2228" ] | | | | ) [ lineorder.%lineorder_lo_partkey_fkey NOT NULL = part.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_partkey_fkey ], | | | | select ( | | | | | table(sys.supplier) [ supplier.s_region, supplier.%TID% NOT NULL ] COUNT -| | | | ) [ supplier.s_region = clob[char(4) "ASIA"] ] +| | | | ) [ supplier.s_region = clob "ASIA" ] | | | ) [ lineorder.%lineorder_lo_suppkey_fkey NOT NULL = supplier.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey ], | | | table(sys.dwdate) [ dwdate.d_year, dwdate.%TID% NOT NULL ] COUNT | | ) [ lineorder.%lineorder_lo_orderdate_fkey NOT NULL = dwdate.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey ] diff --git a/sql/benchmarks/ssbm/Tests/06-plan.stable.out b/sql/benchmarks/ssbm/Tests/06-plan.stable.out --- a/sql/benchmarks/ssbm/Tests/06-plan.stable.out +++ b/sql/benchmarks/ssbm/Tests/06-plan.stable.out @@ -49,11 +49,11 @@ project ( | | | | | table(sys.lineorder) [ lineorder.lo_revenue, lineorder.%lineorder_lo_orderdate_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey, lineorder.%lineorder_lo_suppkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey, lineorder.%lineorder_lo_partkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_partkey_fkey ] COUNT , | | | | | select ( | | | | | | table(sys.part) [ part.p_brand1, part.%TID% NOT NULL ] COUNT -| | | | | ) [ part.p_brand1 = clob[char(9) "MFGR#2221"] ] +| | | | | ) [ part.p_brand1 = clob "MFGR#2221" ] | | | | ) [ lineorder.%lineorder_lo_partkey_fkey NOT NULL = part.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_partkey_fkey ], | | | | select ( | | | | | table(sys.supplier) [ supplier.s_region, supplier.%TID% NOT NULL ] COUNT -| | | | ) [ supplier.s_region = clob[char(6) "EUROPE"] ] +| | | | ) [ supplier.s_region = clob "EUROPE" ] | | | ) [ lineorder.%lineorder_lo_suppkey_fkey NOT NULL = supplier.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey ], | | | table(sys.dwdate) [ dwdate.d_year, dwdate.%TID% NOT NULL ] COUNT | | ) [ lineorder.%lineorder_lo_orderdate_fkey NOT NULL = dwdate.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey ] diff --git a/sql/benchmarks/ssbm/Tests/07-plan.stable.out b/sql/benchmarks/ssbm/Tests/07-plan.stable.out --- a/sql/benchmarks/ssbm/Tests/07-plan.stable.out +++ b/sql/benchmarks/ssbm/Tests/07-plan.stable.out @@ -48,15 +48,15 @@ project ( | | | | | table(sys.lineorder) [ lineorder.lo_revenue, lineorder.%lineorder_lo_orderdate_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey, lineorder.%lineorder_lo_suppkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey, lineorder.%lineorder_lo_custkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_custkey_fkey ] COUNT , | | | | | select ( | | | | | | table(sys.customer) [ customer.c_nation, customer.c_region, customer.%TID% NOT NULL ] COUNT -| | | | | ) [ customer.c_region = clob[char(4) "ASIA"] ] +| | | | | ) [ customer.c_region = clob "ASIA" ] | | | | ) [ lineorder.%lineorder_lo_custkey_fkey NOT NULL = customer.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_custkey_fkey ], | | | | select ( | | | | | table(sys.supplier) [ supplier.s_nation, supplier.s_region, supplier.%TID% NOT NULL ] COUNT -| | | | ) [ supplier.s_region = clob[char(4) "ASIA"] ] +| | | | ) [ supplier.s_region = clob "ASIA" ] | | | ) [ lineorder.%lineorder_lo_suppkey_fkey NOT NULL = supplier.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey ], | | | select ( | | | | table(sys.dwdate) [ dwdate.d_year, dwdate.%TID% NOT NULL ] COUNT -| | | ) [ int[smallint "1992"] <= dwdate.d_year <= int[smallint "1997"] ] +| | | ) [ int "1992" <= dwdate.d_year <= int "1997" ] | | ) [ lineorder.%lineorder_lo_orderdate_fkey NOT NULL = dwdate.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey ] | ) [ dwdate.d_year, customer.c_nation, supplier.s_nation ] [ customer.c_nation, supplier.s_nation, dwdate.d_year, sys.sum no nil (lineorder.lo_revenue) as L1.L1 ] ) [ customer.c_nation, supplier.s_nation, dwdate.d_year, L1 as L1.revenue ] [ dwdate.d_year ASC, L1.revenue ] diff --git a/sql/benchmarks/ssbm/Tests/08-plan.stable.out b/sql/benchmarks/ssbm/Tests/08-plan.stable.out --- a/sql/benchmarks/ssbm/Tests/08-plan.stable.out +++ b/sql/benchmarks/ssbm/Tests/08-plan.stable.out @@ -48,15 +48,15 @@ project ( | | | | | table(sys.lineorder) [ lineorder.lo_revenue, lineorder.%lineorder_lo_orderdate_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey, lineorder.%lineorder_lo_suppkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey, lineorder.%lineorder_lo_custkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_custkey_fkey ] COUNT , | | | | | select ( | | | | | | table(sys.customer) [ customer.c_city, customer.c_nation, customer.%TID% NOT NULL ] COUNT -| | | | | ) [ customer.c_nation = clob[char(13) "UNITED STATES"] ] +| | | | | ) [ customer.c_nation = clob "UNITED STATES" ] | | | | ) [ lineorder.%lineorder_lo_custkey_fkey NOT NULL = customer.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_custkey_fkey ], | | | | select ( | | | | | table(sys.supplier) [ supplier.s_city, supplier.s_nation, supplier.%TID% NOT NULL ] COUNT -| | | | ) [ supplier.s_nation = clob[char(13) "UNITED STATES"] ] +| | | | ) [ supplier.s_nation = clob "UNITED STATES" ] | | | ) [ lineorder.%lineorder_lo_suppkey_fkey NOT NULL = supplier.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey ], | | | select ( | | | | table(sys.dwdate) [ dwdate.d_year, dwdate.%TID% NOT NULL ] COUNT -| | | ) [ int[smallint "1992"] <= dwdate.d_year <= int[smallint "1997"] ] +| | | ) [ int "1992" <= dwdate.d_year <= int "1997" ] | | ) [ lineorder.%lineorder_lo_orderdate_fkey NOT NULL = dwdate.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey ] | ) [ dwdate.d_year, customer.c_city, supplier.s_city ] [ customer.c_city, supplier.s_city, dwdate.d_year, sys.sum no nil (lineorder.lo_revenue) as L1.L1 ] ) [ customer.c_city, supplier.s_city, dwdate.d_year, L1 as L1.revenue ] [ dwdate.d_year ASC, L1.revenue ] diff --git a/sql/benchmarks/ssbm/Tests/09-plan.stable.out b/sql/benchmarks/ssbm/Tests/09-plan.stable.out --- a/sql/benchmarks/ssbm/Tests/09-plan.stable.out +++ b/sql/benchmarks/ssbm/Tests/09-plan.stable.out @@ -50,15 +50,15 @@ project ( | | | | | table(sys.lineorder) [ lineorder.lo_revenue, lineorder.%lineorder_lo_orderdate_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey, lineorder.%lineorder_lo_suppkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey, lineorder.%lineorder_lo_custkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_custkey_fkey ] COUNT , | | | | | select ( | | | | | | table(sys.customer) [ customer.c_city, customer.c_nation, customer.%TID% NOT NULL ] COUNT -| | | | | ) [ customer.c_nation = clob[char(14) "UNITED KINGDOM"], customer.c_city in (clob[char(10) "UNITED KI1"], clob[char(10) "UNITED KI5"]) ] +| | | | | ) [ customer.c_nation = clob "UNITED KINGDOM", customer.c_city in (clob "UNITED KI1", clob "UNITED KI5") ] | | | | ) [ lineorder.%lineorder_lo_custkey_fkey NOT NULL = customer.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_custkey_fkey ], | | | | select ( | | | | | table(sys.supplier) [ supplier.s_city, supplier.s_nation, supplier.%TID% NOT NULL ] COUNT -| | | | ) [ supplier.s_nation = clob[char(14) "UNITED KINGDOM"], supplier.s_city in (clob[char(10) "UNITED KI1"], clob[char(10) "UNITED KI5"]) ] +| | | | ) [ supplier.s_nation = clob "UNITED KINGDOM", supplier.s_city in (clob "UNITED KI1", clob "UNITED KI5") ] | | | ) [ lineorder.%lineorder_lo_suppkey_fkey NOT NULL = supplier.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey ], | | | select ( | | | | table(sys.dwdate) [ dwdate.d_year, dwdate.%TID% NOT NULL ] COUNT -| | | ) [ int[smallint "1992"] <= dwdate.d_year <= int[smallint "1997"] ] +| | | ) [ int "1992" <= dwdate.d_year <= int "1997" ] | | ) [ lineorder.%lineorder_lo_orderdate_fkey NOT NULL = dwdate.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey ] | ) [ dwdate.d_year, customer.c_city, supplier.s_city ] [ customer.c_city, supplier.s_city, dwdate.d_year, sys.sum no nil (lineorder.lo_revenue) as L1.L1 ] ) [ customer.c_city, supplier.s_city, dwdate.d_year, L1 as L1.revenue ] [ dwdate.d_year ASC, L1.revenue ] diff --git a/sql/benchmarks/ssbm/Tests/10-plan.stable.out b/sql/benchmarks/ssbm/Tests/10-plan.stable.out --- a/sql/benchmarks/ssbm/Tests/10-plan.stable.out +++ b/sql/benchmarks/ssbm/Tests/10-plan.stable.out @@ -50,15 +50,15 @@ project ( | | | | | table(sys.lineorder) [ lineorder.lo_revenue, lineorder.%lineorder_lo_orderdate_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey, lineorder.%lineorder_lo_suppkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey, lineorder.%lineorder_lo_custkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_custkey_fkey ] COUNT , | | | | | select ( | | | | | | table(sys.customer) [ customer.c_city, customer.c_nation, customer.%TID% NOT NULL ] COUNT -| | | | | ) [ customer.c_nation = clob[char(14) "UNITED KINGDOM"], customer.c_city in (clob[char(10) "UNITED KI1"], clob[char(10) "UNITED KI5"]) ] +| | | | | ) [ customer.c_nation = clob "UNITED KINGDOM", customer.c_city in (clob "UNITED KI1", clob "UNITED KI5") ] | | | | ) [ lineorder.%lineorder_lo_custkey_fkey NOT NULL = customer.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_custkey_fkey ], | | | | select ( | | | | | table(sys.supplier) [ supplier.s_city, supplier.s_nation, supplier.%TID% NOT NULL ] COUNT -| | | | ) [ supplier.s_nation = clob[char(14) "UNITED KINGDOM"], supplier.s_city in (clob[char(10) "UNITED KI1"], clob[char(10) "UNITED KI5"]) ] +| | | | ) [ supplier.s_nation = clob "UNITED KINGDOM", supplier.s_city in (clob "UNITED KI1", clob "UNITED KI5") ] | | | ) [ lineorder.%lineorder_lo_suppkey_fkey NOT NULL = supplier.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey ], | | | select ( | | | | table(sys.dwdate) [ dwdate.d_year, dwdate.d_yearmonth, dwdate.%TID% NOT NULL ] COUNT -| | | ) [ dwdate.d_yearmonth = clob[char(7) "Dec1997"] ] +| | | ) [ dwdate.d_yearmonth = clob "Dec1997" ] | | ) [ lineorder.%lineorder_lo_orderdate_fkey NOT NULL = dwdate.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey ] | ) [ dwdate.d_year, customer.c_city, supplier.s_city ] [ customer.c_city, supplier.s_city, dwdate.d_year, sys.sum no nil (lineorder.lo_revenue) as L1.L1 ] ) [ customer.c_city, supplier.s_city, dwdate.d_year, L1 as L1.revenue ] [ dwdate.d_year ASC, L1.revenue ] diff --git a/sql/benchmarks/ssbm/Tests/11-plan.stable.out b/sql/benchmarks/ssbm/Tests/11-plan.stable.out --- a/sql/benchmarks/ssbm/Tests/11-plan.stable.out +++ b/sql/benchmarks/ssbm/Tests/11-plan.stable.out @@ -50,15 +50,15 @@ project ( | | | | | | table(sys.lineorder) [ lineorder.lo_revenue, lineorder.lo_supplycost, lineorder.%lineorder_lo_orderdate_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey, lineorder.%lineorder_lo_suppkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey, lineorder.%lineorder_lo_custkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_custkey_fkey, lineorder.%lineorder_lo_partkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_partkey_fkey ] COUNT , | | | | | | select ( | | | | | | | table(sys.part) [ part.p_mfgr, part.%TID% NOT NULL ] COUNT -| | | | | | ) [ part.p_mfgr in (clob[char(6) "MFGR#1"], clob[char(6) "MFGR#2"]) ] +| | | | | | ) [ part.p_mfgr in (clob "MFGR#1", clob "MFGR#2") ] | | | | | ) [ lineorder.%lineorder_lo_partkey_fkey NOT NULL = part.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_partkey_fkey ], | | | | | select ( | | | | | | table(sys.supplier) [ supplier.s_region, supplier.%TID% NOT NULL ] COUNT -| | | | | ) [ supplier.s_region = clob[char(7) "AMERICA"] ] +| | | | | ) [ supplier.s_region = clob "AMERICA" ] | | | | ) [ lineorder.%lineorder_lo_suppkey_fkey NOT NULL = supplier.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey ], | | | | select ( | | | | | table(sys.customer) [ customer.c_nation, customer.c_region, customer.%TID% NOT NULL ] COUNT -| | | | ) [ customer.c_region = clob[char(7) "AMERICA"] ] +| | | | ) [ customer.c_region = clob "AMERICA" ] | | | ) [ lineorder.%lineorder_lo_custkey_fkey NOT NULL = customer.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_custkey_fkey ], | | | table(sys.dwdate) [ dwdate.d_year, dwdate.%TID% NOT NULL ] COUNT | | ) [ lineorder.%lineorder_lo_orderdate_fkey NOT NULL = dwdate.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey ] diff --git a/sql/benchmarks/ssbm/Tests/12-plan.stable.out b/sql/benchmarks/ssbm/Tests/12-plan.stable.out --- a/sql/benchmarks/ssbm/Tests/12-plan.stable.out +++ b/sql/benchmarks/ssbm/Tests/12-plan.stable.out @@ -51,19 +51,19 @@ project ( | | | | | | table(sys.lineorder) [ lineorder.lo_revenue, lineorder.lo_supplycost, lineorder.%lineorder_lo_orderdate_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey, lineorder.%lineorder_lo_suppkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey, lineorder.%lineorder_lo_custkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_custkey_fkey, lineorder.%lineorder_lo_partkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_partkey_fkey ] COUNT , | | | | | | select ( | | | | | | | table(sys.dwdate) [ dwdate.d_year, dwdate.%TID% NOT NULL ] COUNT -| | | | | | ) [ dwdate.d_year in (int[smallint "1997"], int[smallint "1998"]) ] +| | | | | | ) [ dwdate.d_year in (int "1997", int "1998") ] | | | | | ) [ lineorder.%lineorder_lo_orderdate_fkey NOT NULL = dwdate.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey ], | | | | | select ( | | | | | | table(sys.part) [ part.p_mfgr, part.p_category, part.%TID% NOT NULL ] COUNT -| | | | | ) [ part.p_mfgr in (clob[char(6) "MFGR#1"], clob[char(6) "MFGR#2"]) ] +| | | | | ) [ part.p_mfgr in (clob "MFGR#1", clob "MFGR#2") ] | | | | ) [ lineorder.%lineorder_lo_partkey_fkey NOT NULL = part.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_partkey_fkey ], | | | | select ( | | | | | table(sys.supplier) [ supplier.s_nation, supplier.s_region, supplier.%TID% NOT NULL ] COUNT -| | | | ) [ supplier.s_region = clob[char(7) "AMERICA"] ] +| | | | ) [ supplier.s_region = clob "AMERICA" ] | | | ) [ lineorder.%lineorder_lo_suppkey_fkey NOT NULL = supplier.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey ], | | | select ( | | | | table(sys.customer) [ customer.c_region, customer.%TID% NOT NULL ] COUNT -| | | ) [ customer.c_region = clob[char(7) "AMERICA"] ] +| | | ) [ customer.c_region = clob "AMERICA" ] | | ) [ lineorder.%lineorder_lo_custkey_fkey NOT NULL = customer.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_custkey_fkey ] | ) [ dwdate.d_year, supplier.s_nation, part.p_category ] [ dwdate.d_year, supplier.s_nation, part.p_category, sys.sum no nil (sys.sql_sub(bigint[lineorder.lo_revenue] as lineorder.lo_revenue, bigint[lineorder.lo_supplycost] as lineorder.lo_supplycost)) as L1.L1 ] ) [ dwdate.d_year, supplier.s_nation, part.p_category, L1 as L1.profit1 ] [ dwdate.d_year ASC, supplier.s_nation ASC, part.p_category ASC ] diff --git a/sql/benchmarks/ssbm/Tests/13-plan.stable.out b/sql/benchmarks/ssbm/Tests/13-plan.stable.out --- a/sql/benchmarks/ssbm/Tests/13-plan.stable.out +++ b/sql/benchmarks/ssbm/Tests/13-plan.stable.out @@ -51,19 +51,19 @@ project ( | | | | | | table(sys.lineorder) [ lineorder.lo_revenue, lineorder.lo_supplycost, lineorder.%lineorder_lo_orderdate_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey, lineorder.%lineorder_lo_suppkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey, lineorder.%lineorder_lo_custkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_custkey_fkey, lineorder.%lineorder_lo_partkey_fkey NOT NULL JOINIDX sys.lineorder.lineorder_lo_partkey_fkey ] COUNT , | | | | | | select ( | | | | | | | table(sys.dwdate) [ dwdate.d_year, dwdate.%TID% NOT NULL ] COUNT -| | | | | | ) [ dwdate.d_year in (int[smallint "1997"], int[smallint "1998"]) ] +| | | | | | ) [ dwdate.d_year in (int "1997", int "1998") ] | | | | | ) [ lineorder.%lineorder_lo_orderdate_fkey NOT NULL = dwdate.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey ], | | | | | select ( | | | | | | table(sys.part) [ part.p_category, part.p_brand1, part.%TID% NOT NULL ] COUNT -| | | | | ) [ part.p_category = clob[char(7) "MFGR#14"] ] +| | | | | ) [ part.p_category = clob "MFGR#14" ] | | | | ) [ lineorder.%lineorder_lo_partkey_fkey NOT NULL = part.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_partkey_fkey ], | | | | select ( | | | | | table(sys.supplier) [ supplier.s_city, supplier.s_nation, supplier.%TID% NOT NULL ] COUNT -| | | | ) [ supplier.s_nation = clob[char(13) "UNITED STATES"] ] +| | | | ) [ supplier.s_nation = clob "UNITED STATES" ] | | | ) [ lineorder.%lineorder_lo_suppkey_fkey NOT NULL = supplier.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_suppkey_fkey ], | | | select ( | | | | table(sys.customer) [ customer.c_region, customer.%TID% NOT NULL ] COUNT -| | | ) [ customer.c_region = clob[char(7) "AMERICA"] ] +| | | ) [ customer.c_region = clob "AMERICA" ] | | ) [ lineorder.%lineorder_lo_custkey_fkey NOT NULL = customer.%TID% NOT NULL JOINIDX sys.lineorder.lineorder_lo_custkey_fkey ] | ) [ dwdate.d_year, supplier.s_city, part.p_brand1 ] [ dwdate.d_year, supplier.s_city, part.p_brand1, sys.sum no nil (sys.sql_sub(bigint[lineorder.lo_revenue] as lineorder.lo_revenue, bigint[lineorder.lo_supplycost] as lineorder.lo_supplycost)) as L1.L1 ] ) [ dwdate.d_year, supplier.s_city, part.p_brand1, L1 as L1.profit1 ] [ dwdate.d_year ASC, supplier.s_city ASC, part.p_brand1 ASC ] diff --git a/sql/benchmarks/tpch/Tests/02-plan.stable.out b/sql/benchmarks/tpch/Tests/02-plan.stable.out --- a/sql/benchmarks/tpch/Tests/02-plan.stable.out +++ b/sql/benchmarks/tpch/Tests/02-plan.stable.out @@ -76,7 +76,7 @@ top N ( | | | | | | | | | table(sys.nation) [ nation.%TID% NOT NULL as L4.%TID%, nation.%nation_n_regionkey_fkey NOT NULL as L4.%nation_n_regionkey_fkey ] COUNT , | | | | | | | | | select ( | | | | | | | | | | table(sys.region) [ region.r_name NOT NULL as L5.r_name, region.%TID% NOT NULL as L5.%TID% ] COUNT -| | | | | | | | | ) [ L5.r_name NOT NULL = char(25)[char(6) "EUROPE"] ] +| | | | | | | | | ) [ L5.r_name NOT NULL = char(25) "EUROPE" ] | | | | | | | | ) [ L4.%nation_n_regionkey_fkey NOT NULL = L5.%TID% NOT NULL JOINIDX sys.nation.nation_n_regionkey_fkey ], | | | | | | | | table(sys.supplier) [ supplier.%TID% NOT NULL as L3.%TID%, supplier.%supplier_s_nationkey_fkey NOT NULL as L3.%supplier_s_nationkey_fkey ] COUNT | | | | | | | ) [ L3.%supplier_s_nationkey_fkey NOT NULL = L4.%TID% NOT NULL JOINIDX sys.supplier.supplier_s_nationkey_fkey ], @@ -90,7 +90,7 @@ top N ( | | | | | | | | | | | table(sys.partsupp) [ partsupp.ps_supplycost NOT NULL, partsupp.%partsupp_ps_suppkey_fkey NOT NULL JOINIDX sys.partsupp.partsupp_ps_suppkey_fkey, partsupp.%partsupp_ps_partkey_fkey NOT NULL JOINIDX sys.partsupp.partsupp_ps_partkey_fkey ] COUNT , | | | | | | | | | | | select ( | | | | | | | | | | | | table(sys.part) [ part.p_partkey NOT NULL HASHCOL , part.p_mfgr NOT NULL, part.p_type NOT NULL, part.p_size NOT NULL, part.%TID% NOT NULL ] COUNT -| | | | | | | | | | | ) [ part.p_size NOT NULL = int[tinyint "15"], (char[part.p_type NOT NULL] as part.p_type) FILTER like (char[char(6) "%BRASS"], char "") ] +| | | | | | | | | | | ) [ part.p_size NOT NULL = int "15", (char[part.p_type NOT NULL] as part.p_type) FILTER like (char "%BRASS", char "") ] | | | | | | | | | | ) [ partsupp.%partsupp_ps_partkey_fkey NOT NULL = part.%TID% NOT NULL JOINIDX sys.partsupp.partsupp_ps_partkey_fkey ], | | | | | | | | | | table(sys.supplier) [ supplier.s_name NOT NULL, supplier.s_address NOT NULL, supplier.s_phone NOT NULL, supplier.s_acctbal NOT NULL, supplier.s_comment NOT NULL, supplier.%TID% NOT NULL, supplier.%supplier_s_nationkey_fkey NOT NULL JOINIDX sys.supplier.supplier_s_nationkey_fkey ] COUNT | | | | | | | | | ) [ partsupp.%partsupp_ps_suppkey_fkey NOT NULL = supplier.%TID% NOT NULL JOINIDX sys.partsupp.partsupp_ps_suppkey_fkey ], @@ -98,7 +98,7 @@ top N ( | | | | | | | | ) [ supplier.%supplier_s_nationkey_fkey NOT NULL = nation.%TID% NOT NULL JOINIDX sys.supplier.supplier_s_nationkey_fkey ], | | | | | | | | select ( | | | | | | | | | table(sys.region) [ region.r_name NOT NULL, region.%TID% NOT NULL ] COUNT -| | | | | | | | ) [ region.r_name NOT NULL = char(25)[char(6) "EUROPE"] ] +| | | | | | | | ) [ region.r_name NOT NULL = char(25) "EUROPE" ] | | | | | | | ) [ nation.%nation_n_regionkey_fkey NOT NULL = region.%TID% NOT NULL JOINIDX sys.nation.nation_n_regionkey_fkey ] | | | | | | ) [ part.p_partkey NOT NULL HASHCOL , part.p_mfgr NOT NULL, supplier.s_name NOT NULL, supplier.s_address NOT NULL, supplier.s_phone NOT NULL, supplier.s_acctbal NOT NULL, supplier.s_comment NOT NULL, partsupp.ps_supplycost NOT NULL, nation.n_name NOT NULL, sys.identity(part.p_partkey NOT NULL HASHCOL ) HASHCOL as L6.L6 ] | | | | | ) [ part.p_partkey NOT NULL = L2.ps_partkey NOT NULL HASHCOL ] diff --git a/sql/benchmarks/tpch/Tests/03-plan.stable.out b/sql/benchmarks/tpch/Tests/03-plan.stable.out --- a/sql/benchmarks/tpch/Tests/03-plan.stable.out +++ b/sql/benchmarks/tpch/Tests/03-plan.stable.out @@ -62,7 +62,7 @@ top N ( | | | | | ) [ orders.o_orderdate NOT NULL < date "1995-03-15" ], | | | | | select ( | | | | | | table(sys.customer) [ customer.c_mktsegment NOT NULL, customer.%TID% NOT NULL ] COUNT -| | | | | ) [ customer.c_mktsegment NOT NULL = char(10)[char(8) "BUILDING"] ] +| | | | | ) [ customer.c_mktsegment NOT NULL = char(10) "BUILDING" ] | | | | ) [ orders.%orders_o_custkey_fkey NOT NULL = customer.%TID% NOT NULL JOINIDX sys.orders.orders_o_custkey_fkey ], | | | | select ( _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
