[prev in list] [next in list] [prev in thread] [next in thread] 

List:       monetdb-checkins
Subject:    MonetDB: default - Approve after changeset 0ac3b2ee5dcb.
From:       Sjoerd Mullender <commits+sjoerd=acm.org () monetdb ! org>
Date:       2016-08-29 13:48:06
Message-ID: hg.ed3244cd3964.1472478486.6315528441665844383 () monetdb2 ! cwi-incubator ! nl
[Download RAW message or body]

Changeset: ed3244cd3964 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed3244cd3964
Modified Files:
	sql/benchmarks/tpch/Tests/01-plan.stable.out
	sql/benchmarks/tpch/Tests/03-plan.stable.out
	sql/benchmarks/tpch/Tests/05-plan.stable.out
	sql/benchmarks/tpch/Tests/06-plan.stable.out
	sql/benchmarks/tpch/Tests/07-plan.stable.out
	sql/benchmarks/tpch/Tests/08-explain.stable.out
	sql/benchmarks/tpch/Tests/08-plan.stable.out
	sql/benchmarks/tpch/Tests/09-plan.stable.out
	sql/benchmarks/tpch/Tests/10-plan.stable.out
	sql/benchmarks/tpch/Tests/11-plan.stable.out
	sql/benchmarks/tpch/Tests/12-explain.stable.out
	sql/benchmarks/tpch/Tests/14-explain.stable.out
	sql/benchmarks/tpch/Tests/14-plan.stable.out
	sql/benchmarks/tpch/Tests/19-plan.stable.out
Branch: default
Log Message:

Approve after changeset 0ac3b2ee5dcb.


diffs (truncated from 679 to 300 lines):

diff --git a/sql/benchmarks/tpch/Tests/01-plan.stable.out \
                b/sql/benchmarks/tpch/Tests/01-plan.stable.out
--- a/sql/benchmarks/tpch/Tests/01-plan.stable.out
+++ b/sql/benchmarks/tpch/Tests/01-plan.stable.out
@@ -49,13 +49,15 @@ Ready.
 % .plan # table_name
 % rel # name
 % clob # type
-% 945 # length
+% 613 # length
 project (
 | group by (
-| | select (
-| | | table(sys.lineitem) [ lineitem.l_quantity NOT NULL, lineitem.l_extendedprice \
NOT NULL, lineitem.l_discount NOT NULL, lineitem.l_tax NOT NULL, \
lineitem.l_returnflag NOT NULL, lineitem.l_linestatus NOT NULL, lineitem.l_shipdate \
                NOT NULL ] COUNT 
-| | ) [ lineitem.l_shipdate NOT NULL <= sys.sql_sub(date "1998-12-01", \
                sec_interval(4) "7776000000") ]
-| ) [ lineitem.l_returnflag NOT NULL, lineitem.l_linestatus NOT NULL ] [ \
lineitem.l_returnflag NOT NULL, lineitem.l_linestatus NOT NULL, sys.sum no nil \
(lineitem.l_quantity NOT NULL) NOT NULL as L1.L1, sys.sum no nil \
(lineitem.l_extendedprice NOT NULL) NOT NULL as L2.L2, sys.sum no nil \
(sys.sql_mul(lineitem.l_extendedprice NOT NULL, sys.sql_sub(decimal(15,2)[tinyint \
"1"], lineitem.l_discount NOT NULL))) as L3.L3, sys.sum no nil \
(sys.sql_mul(sys.sql_mul(lineitem.l_extendedprice NOT NULL, \
sys.sql_sub(decimal(15,2)[tinyint "1"], lineitem.l_discount NOT NULL)), \
sys.sql_add(decimal(15,2)[tinyint "1"], lineitem.l_tax NOT NULL))) as L4.L4, sys.avg \
no nil (double[lineitem.l_quantity NOT NULL] as lineitem.l_quantity) as L5.L5, \
sys.avg no nil (double[lineitem.l_extendedprice NOT NULL] as \
lineitem.l_extendedprice) as L6.L6, sys.avg no nil (double[lineitem.l_discount NOT \
NULL] as lineitem.l_discount) as L7.L7, sys.count() NOT NULL as L10.L10 ] +| | \
project ( +| | | select (
+| | | | table(sys.lineitem) [ lineitem.l_quantity NOT NULL, lineitem.l_extendedprice \
NOT NULL, lineitem.l_discount NOT NULL, lineitem.l_tax NOT NULL, \
lineitem.l_returnflag NOT NULL, lineitem.l_linestatus NOT NULL, lineitem.l_shipdate \
NOT NULL ] COUNT  +| | | ) [ lineitem.l_shipdate NOT NULL <= sys.sql_sub(date \
"1998-12-01", sec_interval(4) "7776000000") ] +| | ) [ lineitem.l_quantity NOT NULL, \
lineitem.l_extendedprice NOT NULL, lineitem.l_discount NOT NULL, lineitem.l_tax NOT \
NULL, lineitem.l_returnflag NOT NULL, lineitem.l_linestatus NOT NULL, \
sys.sql_sub(decimal(15,2)[tinyint "1"], lineitem.l_discount NOT NULL) as L11.L11, \
sys.sql_mul(lineitem.l_extendedprice NOT NULL, L11.L11) as L12.L12, \
sys.sql_add(decimal(15,2)[tinyint "1"], lineitem.l_tax NOT NULL) as L13.L13, \
sys.sql_mul(L12.L12, L13.L13) as L14.L14, double[lineitem.l_quantity NOT NULL] as \
L15.L15, double[lineitem.l_extendedprice NOT NULL] as L16.L16, \
double[lineitem.l_discount NOT NULL] as L17.L17 ] +| ) [ lineitem.l_returnflag NOT \
NULL, lineitem.l_linestatus NOT NULL ] [ lineitem.l_returnflag NOT NULL, \
lineitem.l_linestatus NOT NULL, sys.sum no nil (lineitem.l_quantity NOT NULL) NOT \
NULL as L1.L1, sys.sum no nil (lineitem.l_extendedprice NOT NULL) NOT NULL as L2.L2, \
sys.sum no nil (L12.L12) as L3.L3, sys.sum no nil (L14.L14) as L4.L4, sys.avg no nil \
(L15.L15) as L5.L5, sys.avg no nil (L16.L16) as L6.L6, sys.avg no nil (L17.L17) as \
L7.L7, sys.count() NOT NULL as L10.L10 ]  ) [ lineitem.l_returnflag NOT NULL, \
lineitem.l_linestatus NOT NULL, L1 NOT NULL as L1.sum_qty, L2 NOT NULL as \
L2.sum_base_price, L3 as L3.sum_disc_price, L4 as L4.sum_charge, L5 as L5.avg_qty, L6 \
as L6.avg_price, L7 as L7.avg_disc, L10 NOT NULL as L10.count_order ] [ \
lineitem.l_returnflag ASC NOT NULL, lineitem.l_linestatus ASC NOT NULL ]  
 # 22:46:28 >  
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
@@ -51,24 +51,26 @@ Ready.
 % .plan # table_name
 % rel # name
 % clob # type
-% 356 # length
+% 319 # length
 top N (
 | project (
 | | group by (
-| | | join (
+| | | project (
 | | | | join (
+| | | | | join (
+| | | | | | select (
+| | | | | | | table(sys.orders) [ orders.o_orderdate NOT NULL, orders.o_shippriority \
NOT NULL, orders.%TID% NOT NULL, orders.%orders_o_custkey_fkey NOT NULL JOINIDX \
sys.orders.orders_o_custkey_fkey ] COUNT  +| | | | | | ) [ 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) \
"BUILDING" ] +| | | | | ) [ orders.%orders_o_custkey_fkey NOT NULL = customer.%TID% \
NOT NULL JOINIDX sys.orders.orders_o_custkey_fkey ],  | | | | | select (
-| | | | | | table(sys.orders) [ orders.o_orderdate NOT NULL, orders.o_shippriority \
NOT NULL, orders.%TID% NOT NULL, orders.%orders_o_custkey_fkey NOT NULL JOINIDX \
                sys.orders.orders_o_custkey_fkey ] COUNT 
-| | | | | ) [ 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) "BUILDING" ]
-| | | | ) [ orders.%orders_o_custkey_fkey NOT NULL = customer.%TID% NOT NULL JOINIDX \
                sys.orders.orders_o_custkey_fkey ],
-| | | | select (
-| | | | | table(sys.lineitem) [ lineitem.l_orderkey NOT NULL HASHCOL , \
lineitem.l_extendedprice NOT NULL, lineitem.l_discount NOT NULL, lineitem.l_shipdate \
NOT NULL, lineitem.%lineitem_l_orderkey_fkey NOT NULL JOINIDX \
                sys.lineitem.lineitem_l_orderkey_fkey ] COUNT 
-| | | | ) [ lineitem.l_shipdate NOT NULL > date "1995-03-15" ]
-| | | ) [ lineitem.%lineitem_l_orderkey_fkey NOT NULL = orders.%TID% NOT NULL \
                JOINIDX sys.lineitem.lineitem_l_orderkey_fkey ]
-| | ) [ lineitem.l_orderkey NOT NULL HASHCOL , orders.o_shippriority NOT NULL, \
orders.o_orderdate NOT NULL ] [ lineitem.l_orderkey NOT NULL HASHCOL , \
orders.o_orderdate NOT NULL, orders.o_shippriority NOT NULL, sys.sum no nil \
(sys.sql_mul(lineitem.l_extendedprice NOT NULL, sys.sql_sub(decimal(15,2)[tinyint \
"1"], lineitem.l_discount NOT NULL))) as L1.L1 ] +| | | | | | table(sys.lineitem) [ \
lineitem.l_orderkey NOT NULL HASHCOL , lineitem.l_extendedprice NOT NULL, \
lineitem.l_discount NOT NULL, lineitem.l_shipdate NOT NULL, \
lineitem.%lineitem_l_orderkey_fkey NOT NULL JOINIDX \
sys.lineitem.lineitem_l_orderkey_fkey ] COUNT  +| | | | | ) [ lineitem.l_shipdate NOT \
NULL > date "1995-03-15" ] +| | | | ) [ lineitem.%lineitem_l_orderkey_fkey NOT NULL = \
orders.%TID% NOT NULL JOINIDX sys.lineitem.lineitem_l_orderkey_fkey ] +| | | ) [ \
orders.o_orderdate NOT NULL, orders.o_shippriority NOT NULL, lineitem.l_orderkey NOT \
NULL HASHCOL , lineitem.l_extendedprice NOT NULL, lineitem.l_discount NOT NULL, \
sys.sql_sub(decimal(15,2)[tinyint "1"], lineitem.l_discount NOT NULL) as L2.L2, \
sys.sql_mul(lineitem.l_extendedprice NOT NULL, L2.L2) as L3.L3 ] +| | ) [ \
lineitem.l_orderkey NOT NULL HASHCOL , orders.o_shippriority NOT NULL, \
orders.o_orderdate NOT NULL ] [ lineitem.l_orderkey NOT NULL HASHCOL , \
orders.o_orderdate NOT NULL, orders.o_shippriority NOT NULL, sys.sum no nil (L3.L3) \
as L1.L1 ]  | ) [ lineitem.l_orderkey NOT NULL, L1 as L1.revenue, orders.o_orderdate \
NOT NULL, orders.o_shippriority NOT NULL ] [ L1.revenue, orders.o_orderdate ASC NOT \
NULL ]  ) [ bigint "10" ]
 
diff --git a/sql/benchmarks/tpch/Tests/05-plan.stable.out \
                b/sql/benchmarks/tpch/Tests/05-plan.stable.out
--- a/sql/benchmarks/tpch/Tests/05-plan.stable.out
+++ b/sql/benchmarks/tpch/Tests/05-plan.stable.out
@@ -52,30 +52,32 @@ Ready.
 % .plan # table_name
 % rel # name
 % clob # type
-% 226 # length
+% 241 # length
 project (
 | group by (
-| | join (
+| | project (
 | | | join (
 | | | | join (
 | | | | | join (
 | | | | | | join (
-| | | | | | | select (
-| | | | | | | | table(sys.orders) [ orders.o_orderdate NOT NULL, orders.%TID% NOT \
NULL, orders.%orders_o_custkey_fkey NOT NULL JOINIDX sys.orders.orders_o_custkey_fkey \
                ] COUNT 
-| | | | | | | ) [ date "1994-01-01" <= orders.o_orderdate NOT NULL < \
                sys.sql_add(date "1994-01-01", month_interval "12") ],
-| | | | | | | table(sys.customer) [ customer.c_nationkey NOT NULL, customer.%TID% \
                NOT NULL ] COUNT 
-| | | | | | ) [ orders.%orders_o_custkey_fkey NOT NULL = customer.%TID% NOT NULL \
                JOINIDX sys.orders.orders_o_custkey_fkey ],
-| | | | | | table(sys.lineitem) [ lineitem.l_suppkey NOT NULL, \
lineitem.l_extendedprice NOT NULL, lineitem.l_discount NOT NULL, \
lineitem.%lineitem_l_orderkey_fkey NOT NULL JOINIDX \
                sys.lineitem.lineitem_l_orderkey_fkey ] COUNT 
-| | | | | ) [ lineitem.%lineitem_l_orderkey_fkey NOT NULL = orders.%TID% NOT NULL \
                JOINIDX sys.lineitem.lineitem_l_orderkey_fkey ],
-| | | | | table(sys.supplier) [ supplier.s_suppkey NOT NULL HASHCOL , \
supplier.s_nationkey NOT NULL, supplier.%supplier_s_nationkey_fkey NOT NULL JOINIDX \
                sys.supplier.supplier_s_nationkey_fkey ] COUNT 
-| | | | ) [ lineitem.l_suppkey NOT NULL = supplier.s_suppkey NOT NULL HASHCOL , \
                customer.c_nationkey NOT NULL = supplier.s_nationkey NOT NULL ],
-| | | | table(sys.nation) [ nation.n_name NOT NULL, nation.%TID% NOT NULL, \
nation.%nation_n_regionkey_fkey NOT NULL JOINIDX sys.nation.nation_n_regionkey_fkey ] \
                COUNT 
-| | | ) [ 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) "ASIA" ]
-| | ) [ nation.%nation_n_regionkey_fkey NOT NULL = region.%TID% NOT NULL JOINIDX \
                sys.nation.nation_n_regionkey_fkey ]
-| ) [ nation.n_name NOT NULL ] [ nation.n_name NOT NULL, sys.sum no nil \
(sys.sql_mul(lineitem.l_extendedprice NOT NULL, sys.sql_sub(decimal(15,2)[tinyint \
"1"], lineitem.l_discount NOT NULL))) as L1.L1 ] +| | | | | | | join (
+| | | | | | | | select (
+| | | | | | | | | table(sys.orders) [ orders.o_orderdate NOT NULL, orders.%TID% NOT \
NULL, orders.%orders_o_custkey_fkey NOT NULL JOINIDX sys.orders.orders_o_custkey_fkey \
] COUNT  +| | | | | | | | ) [ date "1994-01-01" <= orders.o_orderdate NOT NULL < \
sys.sql_add(date "1994-01-01", month_interval "12") ], +| | | | | | | | \
table(sys.customer) [ customer.c_nationkey NOT NULL, customer.%TID% NOT NULL ] COUNT  \
+| | | | | | | ) [ orders.%orders_o_custkey_fkey NOT NULL = customer.%TID% NOT NULL \
JOINIDX sys.orders.orders_o_custkey_fkey ], +| | | | | | | table(sys.lineitem) [ \
lineitem.l_suppkey NOT NULL, lineitem.l_extendedprice NOT NULL, lineitem.l_discount \
NOT NULL, lineitem.%lineitem_l_orderkey_fkey NOT NULL JOINIDX \
sys.lineitem.lineitem_l_orderkey_fkey ] COUNT  +| | | | | | ) [ \
lineitem.%lineitem_l_orderkey_fkey NOT NULL = orders.%TID% NOT NULL JOINIDX \
sys.lineitem.lineitem_l_orderkey_fkey ], +| | | | | | table(sys.supplier) [ \
supplier.s_suppkey NOT NULL HASHCOL , supplier.s_nationkey NOT NULL, \
supplier.%supplier_s_nationkey_fkey NOT NULL JOINIDX \
sys.supplier.supplier_s_nationkey_fkey ] COUNT  +| | | | | ) [ lineitem.l_suppkey NOT \
NULL = supplier.s_suppkey NOT NULL HASHCOL , customer.c_nationkey NOT NULL = \
supplier.s_nationkey NOT NULL ], +| | | | | table(sys.nation) [ nation.n_name NOT \
NULL, nation.%TID% NOT NULL, nation.%nation_n_regionkey_fkey NOT NULL JOINIDX \
sys.nation.nation_n_regionkey_fkey ] COUNT  +| | | | ) [ \
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) "ASIA" ]
+| | | ) [ nation.%nation_n_regionkey_fkey NOT NULL = region.%TID% NOT NULL JOINIDX \
sys.nation.nation_n_regionkey_fkey ] +| | ) [ lineitem.l_extendedprice NOT NULL, \
lineitem.l_discount NOT NULL, nation.n_name NOT NULL, \
sys.sql_sub(decimal(15,2)[tinyint "1"], lineitem.l_discount NOT NULL) as L2.L2, \
sys.sql_mul(lineitem.l_extendedprice NOT NULL, L2.L2) as L3.L3 ] +| ) [ nation.n_name \
NOT NULL ] [ nation.n_name NOT NULL, sys.sum no nil (L3.L3) as L1.L1 ]  ) [ \
nation.n_name NOT NULL, L1 as L1.revenue ] [ L1.revenue ]  
 # 22:46:29 >  
diff --git a/sql/benchmarks/tpch/Tests/06-plan.stable.out \
                b/sql/benchmarks/tpch/Tests/06-plan.stable.out
--- a/sql/benchmarks/tpch/Tests/06-plan.stable.out
+++ b/sql/benchmarks/tpch/Tests/06-plan.stable.out
@@ -37,13 +37,15 @@ Ready.
 % .plan # table_name
 % rel # name
 % clob # type
-% 363 # length
+% 365 # length
 project (
 | group by (
-| | select (
-| | | table(sys.lineitem) [ lineitem.l_quantity NOT NULL, lineitem.l_extendedprice \
                NOT NULL, lineitem.l_discount NOT NULL, lineitem.l_shipdate NOT NULL \
                ] COUNT 
-| | ) [ date "1994-01-01" <= lineitem.l_shipdate NOT NULL < sys.sql_add(date \
"1994-01-01", month_interval "12"), \
decimal(15,2)[sys.sql_sub(decimal(3,2)[decimal(2,2) "6"], decimal(3,2) "1")] <= \
lineitem.l_discount NOT NULL <= decimal(15,2)[sys.sql_add(decimal(3,2)[decimal(2,2) \
"6"], decimal(3,2) "1")], lineitem.l_quantity NOT NULL < decimal(15,2)[tinyint "24"] \
                ]
-| ) [  ] [ sys.sum no nil (sys.sql_mul(lineitem.l_extendedprice NOT NULL, \
lineitem.l_discount NOT NULL)) as L1.L1 ] +| | project (
+| | | select (
+| | | | table(sys.lineitem) [ lineitem.l_quantity NOT NULL, lineitem.l_extendedprice \
NOT NULL, lineitem.l_discount NOT NULL, lineitem.l_shipdate NOT NULL ] COUNT  +| | | \
) [ date "1994-01-01" <= lineitem.l_shipdate NOT NULL < sys.sql_add(date \
"1994-01-01", month_interval "12"), \
decimal(15,2)[sys.sql_sub(decimal(3,2)[decimal(2,2) "6"], decimal(3,2) "1")] <= \
lineitem.l_discount NOT NULL <= decimal(15,2)[sys.sql_add(decimal(3,2)[decimal(2,2) \
"6"], decimal(3,2) "1")], lineitem.l_quantity NOT NULL < decimal(15,2)[tinyint "24"] \
] +| | ) [ lineitem.l_extendedprice NOT NULL, lineitem.l_discount NOT NULL, \
sys.sql_mul(lineitem.l_extendedprice NOT NULL, lineitem.l_discount NOT NULL) as L2.L2 \
] +| ) [  ] [ sys.sum no nil (L2.L2) as L1.L1 ]
 ) [ L1 as L1.revenue ]
 
 # 22:46:30 >  
diff --git a/sql/benchmarks/tpch/Tests/07-plan.stable.out \
                b/sql/benchmarks/tpch/Tests/07-plan.stable.out
--- a/sql/benchmarks/tpch/Tests/07-plan.stable.out
+++ b/sql/benchmarks/tpch/Tests/07-plan.stable.out
@@ -55,7 +55,7 @@ Ready.
 % .plan # table_name
 % rel # name
 % clob # type
-% 293 # length
+% 309 # length
 project (
 | group by (
 | | project (
@@ -83,7 +83,7 @@ project (
 | | | | | ) [ n2.n_name NOT NULL in (char(25) "GERMANY", char(25) "FRANCE") ]
 | | | | ) [ customer.%customer_c_nationkey_fkey NOT NULL = n2.%TID% NOT NULL JOINIDX \
sys.customer.customer_c_nationkey_fkey ]  | | | ) [ (n1.n_name NOT NULL = char(25) \
"FRANCE", n2.n_name NOT NULL = char(25) "GERMANY") or (n1.n_name NOT NULL = char(25) \
                "GERMANY", n2.n_name NOT NULL = char(25) "FRANCE") ]
-| | ) [ n1.n_name NOT NULL as shipping.supp_nation, n2.n_name NOT NULL as \
shipping.cust_nation, sys.year(lineitem.l_shipdate NOT NULL) as shipping.l_year, \
sys.sql_mul(lineitem.l_extendedprice NOT NULL, sys.sql_sub(decimal(15,2)[tinyint \
"1"], lineitem.l_discount NOT NULL)) as shipping.volume ] +| | ) [ n1.n_name NOT NULL \
as shipping.supp_nation, n2.n_name NOT NULL as shipping.cust_nation, \
sys.year(lineitem.l_shipdate NOT NULL) as shipping.l_year, \
sys.sql_sub(decimal(15,2)[tinyint "1"], lineitem.l_discount NOT NULL) as L2.L2, \
sys.sql_mul(lineitem.l_extendedprice NOT NULL, L2.L2) as shipping.volume ]  | ) [ \
shipping.supp_nation NOT NULL, shipping.cust_nation NOT NULL, shipping.l_year ] [ \
shipping.supp_nation NOT NULL, shipping.cust_nation NOT NULL, shipping.l_year, \
sys.sum no nil (shipping.volume) as L1.L1 ]  ) [ shipping.supp_nation NOT NULL, \
shipping.cust_nation NOT NULL, shipping.l_year, L1 as L1.revenue ] [ \
shipping.supp_nation ASC NOT NULL, shipping.cust_nation ASC NOT NULL, shipping.l_year \
ASC ]  
diff --git a/sql/benchmarks/tpch/Tests/08-explain.stable.out \
                b/sql/benchmarks/tpch/Tests/08-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/08-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/08-explain.stable.out
@@ -59,22 +59,22 @@ Ready.
 % clob # type
 % 836 # length
 function user.s2_1(A0:str,A1:bte,A2:bte,A3:str,A4:date,A5:date,A6:str):void;
-    X_274:void := querylog.define("explain select\n o_year,\n sum(case\n when nation \
= \\'BRAZIL\\' then volume\n else 0\n end) / sum(volume) as mkt_share\nfrom\n (\n \
select\n extract(year from o_orderdate) as o_year,\n l_extendedprice * (1 - \
l_discount) as volume,\n n2.n_name as nation\n from\n part,\n supplier,\n lineitem,\n \
orders,\n customer,\n nation n1,\n nation n2,\n region\n where\n p_partkey = \
l_partkey\n and s_suppkey = l_suppkey\n and l_orderkey = o_orderkey\n and o_custkey = \
c_custkey\n and c_nationkey = n1.n_nationkey\n and n1.n_regionkey = r_regionkey\n and \
r_name = \\'AMERICA\\'\n and s_nationkey = n2.n_nationkey\n and o_orderdate between \
date \\'1995-01-01\\' and date \\'1996-12-31\\'\n and p_type = \\'ECONOMY ANODIZED \
STEEL\\'\n ) as all_nations\ngroup by\n o_year\norder by\n \
o_year;","sequential_pipe",133); +    X_272:void := querylog.define("explain select\n \
o_year,\n sum(case\n when nation = \\'BRAZIL\\' then volume\n else 0\n end) / \
sum(volume) as mkt_share\nfrom\n (\n select\n extract(year from o_orderdate) as \
o_year,\n l_extendedprice * (1 - l_discount) as volume,\n n2.n_name as nation\n \
from\n part,\n supplier,\n lineitem,\n orders,\n customer,\n nation n1,\n nation \
n2,\n region\n where\n p_partkey = l_partkey\n and s_suppkey = l_suppkey\n and \
l_orderkey = o_orderkey\n and o_custkey = c_custkey\n and c_nationkey = \
n1.n_nationkey\n and n1.n_regionkey = r_regionkey\n and r_name = \\'AMERICA\\'\n and \
s_nationkey = n2.n_nationkey\n and o_orderdate between date \\'1995-01-01\\' and date \
\\'1996-12-31\\'\n and p_type = \\'ECONOMY ANODIZED STEEL\\'\n ) as \
all_nations\ngroup by\n o_year\norder by\n o_year;","sequential_pipe",133); +    \
X_245 := bat.new(nil:str); +    X_252 := bat.append(X_245,"sys.all_nations");
+    X_262 := bat.append(X_252,"sys.L3");
     X_247 := bat.new(nil:str);
-    X_254 := bat.append(X_247,"sys.all_nations");
-    X_264 := bat.append(X_254,"sys.L3");
-    X_249 := bat.new(nil:str);
-    X_256 := bat.append(X_249,"o_year");
-    X_266 := bat.append(X_256,"mkt_share");
-    X_250 := bat.new(nil:str);
-    X_258 := bat.append(X_250,"int");
-    X_268 := bat.append(X_258,"decimal");
+    X_254 := bat.append(X_247,"o_year");
+    X_264 := bat.append(X_254,"mkt_share");
+    X_248 := bat.new(nil:str);
+    X_256 := bat.append(X_248,"int");
+    X_266 := bat.append(X_256,"decimal");
+    X_249 := bat.new(nil:int);
+    X_258 := bat.append(X_249,32);
+    X_268 := bat.append(X_258,19);
     X_251 := bat.new(nil:int);
-    X_260 := bat.append(X_251,32);
-    X_270 := bat.append(X_260,19);
-    X_253 := bat.new(nil:int);
-    X_262 := bat.append(X_253,0);
-    X_272 := bat.append(X_262,4);
+    X_260 := bat.append(X_251,0);
+    X_270 := bat.append(X_260,4);
     X_0 := sql.mvc();
     C_1:bat[:oid] := sql.tid(X_0,"sys","nation");
     X_4:bat[:oid] := \
sql.bind_idxbat(X_0,"sys","nation","nation_n_regionkey_fkey",0); @@ -83,12 +83,12 @@ \
function user.s2_1(A0:str,A1:bte,A2:bte,  X_13 := \
sql.projectdelta(C_1,X_4,X_7,r1_15,X_10);  X_16:bat[:str] := \
sql.bind(X_0,"sys","region","r_name",0);  C_14:bat[:oid] := \
                sql.tid(X_0,"sys","region");
-    C_290 := algebra.subselect(X_16,C_14,A3,A3,true,false,false);
+    C_288 := algebra.subselect(X_16,C_14,A3,A3,true,false,false);
     (C_18:bat[:oid],r1_26:bat[:str]) := sql.bind(X_0,"sys","region","r_name",2);
-    C_291 := algebra.subselect(r1_26,nil:bat[:oid],A3,A3,true,false,false);
+    C_289 := algebra.subselect(r1_26,nil:bat[:oid],A3,A3,true,false,false);
     X_20:bat[:str] := sql.bind(X_0,"sys","region","r_name",1);
-    C_293 := algebra.subselect(X_20,C_14,A3,A3,true,false,false);
-    C_24 := sql.subdelta(C_290,C_14,C_18,C_291,C_293);
+    C_291 := algebra.subselect(X_20,C_14,A3,A3,true,false,false);
+    C_24 := sql.subdelta(C_288,C_14,C_18,C_289,C_291);
     (X_29,r1_37) := algebra.subjoin(X_13,C_24,nil:BAT,nil:BAT,false,nil:lng);
     X_34 := algebra.projection(X_29,C_1);
     C_35:bat[:oid] := sql.tid(X_0,"sys","customer");
@@ -100,12 +100,12 @@ function user.s2_1(A0:str,A1:bte,A2:bte,
     X_46 := algebra.projection(r1_52,C_35);
     X_49:bat[:date] := sql.bind(X_0,"sys","orders","o_orderdate",0);
     C_47:bat[:oid] := sql.tid(X_0,"sys","orders");
-    C_294 := algebra.subselect(X_49,C_47,A4,A5,true,true,false);
+    C_292 := algebra.subselect(X_49,C_47,A4,A5,true,true,false);
     (C_51:bat[:oid],r1_59:bat[:date]) := \
                sql.bind(X_0,"sys","orders","o_orderdate",2);
-    C_295 := algebra.subselect(r1_59,nil:bat[:oid],A4,A5,true,true,false);
+    C_293 := algebra.subselect(r1_59,nil:bat[:oid],A4,A5,true,true,false);
     X_53:bat[:date] := sql.bind(X_0,"sys","orders","o_orderdate",1);
-    C_297 := algebra.subselect(X_53,C_47,A4,A5,true,true,false);
-    C_58 := sql.subdelta(C_294,C_47,C_51,C_295,C_297);
+    C_295 := algebra.subselect(X_53,C_47,A4,A5,true,true,false);
+    C_58 := sql.subdelta(C_292,C_47,C_51,C_293,C_295);
     X_62:bat[:oid] := sql.bind_idxbat(X_0,"sys","orders","orders_o_custkey_fkey",0);
     (X_64,r1_72) := sql.bind_idxbat(X_0,"sys","orders","orders_o_custkey_fkey",2);
     X_66:bat[:oid] := sql.bind_idxbat(X_0,"sys","orders","orders_o_custkey_fkey",1);
@@ -125,12 +125,12 @@ function user.s2_1(A0:str,A1:bte,A2:bte,
     X_95 := algebra.projection(r1_94,X_94);
     X_98:bat[:str] := sql.bind(X_0,"sys","part","p_type",0);
     C_96:bat[:oid] := sql.tid(X_0,"sys","part");
-    C_298 := algebra.subselect(X_98,C_96,A6,A6,true,false,false);
+    C_296 := algebra.subselect(X_98,C_96,A6,A6,true,false,false);
     (C_100:bat[:oid],r1_108:bat[:str]) := sql.bind(X_0,"sys","part","p_type",2);
-    C_299 := algebra.subselect(r1_108,nil:bat[:oid],A6,A6,true,false,false);
+    C_297 := algebra.subselect(r1_108,nil:bat[:oid],A6,A6,true,false,false);
     X_102:bat[:str] := sql.bind(X_0,"sys","part","p_type",1);
-    C_301 := algebra.subselect(X_102,C_96,A6,A6,true,false,false);
-    C_106 := sql.subdelta(C_298,C_96,C_100,C_299,C_301);
+    C_299 := algebra.subselect(X_102,C_96,A6,A6,true,false,false);
+    C_106 := sql.subdelta(C_296,C_96,C_100,C_297,C_299);
     X_110:bat[:int] := sql.bind(X_0,"sys","part","p_partkey",0);
     (C_112:bat[:oid],r1_120:bat[:int]) := sql.bind(X_0,"sys","part","p_partkey",2);
     X_114:bat[:int] := sql.bind(X_0,"sys","part","p_partkey",1);
@@ -165,31 +165,31 @@ function user.s2_1(A0:str,A1:bte,A2:bte,
     X_187 := algebra.projection(r1_162,X_186);
     X_189:bat[:bit] := batcalc.==(X_187,A0);
     X_192:bat[:bit] := batcalc.isnil(X_189);
-    X_197:bat[:bit] := batcalc.ifthenelse(X_192,false,X_189);
-    X_199:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_extendedprice",0);
-    (C_201:bat[:oid],r1_209:bat[:lng]) := \
                sql.bind(X_0,"sys","lineitem","l_extendedprice",2);
-    X_203:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_extendedprice",1);
-    X_205 := sql.projectdelta(C_77,X_199,C_201,r1_209,X_203);
-    X_209:bat[:lng] := algebra.projectionpath(X_154,X_141,X_118,r1_94,X_205);
-    X_211 := calc.lng(A2,15,2);
-    X_214:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_discount",0);
-    (C_216:bat[:oid],r1_224:bat[:lng]) := \
                sql.bind(X_0,"sys","lineitem","l_discount",2);
-    X_218:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_discount",1);
-    X_220 := sql.projectdelta(C_77,X_214,C_216,r1_224,X_218);
-    X_224:bat[:lng] := algebra.projectionpath(X_154,X_141,X_118,r1_94,X_220);
-    X_225:bat[:lng] := batcalc.-(X_211,X_224);
-    X_228:bat[:lng] := batcalc.*(X_209,X_225);
-    X_231 := calc.lng(A1,19,4);
-    X_234:bat[:lng] := batcalc.ifthenelse(X_197,X_228,X_231);
-    X_236:bat[:lng] := aggr.subsum(X_234,X_168,r1_176,true,true);
-    X_242:bat[:lng] := aggr.subsum(X_228,X_168,r1_176,true,true);
+    X_195:bat[:bit] := batcalc.ifthenelse(X_192,false,X_189);
+    X_197:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_extendedprice",0);
+    (C_199:bat[:oid],r1_207:bat[:lng]) := \
sql.bind(X_0,"sys","lineitem","l_extendedprice",2); +    X_201:bat[:lng] := \
sql.bind(X_0,"sys","lineitem","l_extendedprice",1); +    X_203 := \
sql.projectdelta(C_77,X_197,C_199,r1_207,X_201); +    X_207:bat[:lng] := \
algebra.projectionpath(X_154,X_141,X_118,r1_94,X_203); +    X_209 := \
calc.lng(A2,15,2); +    X_212:bat[:lng] := \
sql.bind(X_0,"sys","lineitem","l_discount",0); +    \
(C_214:bat[:oid],r1_222:bat[:lng]) := sql.bind(X_0,"sys","lineitem","l_discount",2); \
+    X_216:bat[:lng] := sql.bind(X_0,"sys","lineitem","l_discount",1); +    X_218 := \
sql.projectdelta(C_77,X_212,C_214,r1_222,X_216); +    X_222:bat[:lng] := \
algebra.projectionpath(X_154,X_141,X_118,r1_94,X_218); +    X_223:bat[:lng] := \
batcalc.-(X_209,X_222); +    X_226:bat[:lng] := batcalc.*(X_207,X_223);
+    X_229 := calc.lng(A1,19,4);
+    X_232:bat[:lng] := batcalc.ifthenelse(X_195,X_226,X_229);
+    X_234:bat[:lng] := aggr.subsum(X_232,X_168,r1_176,true,true);
+    X_240:bat[:lng] := aggr.subsum(X_226,X_168,r1_176,true,true);
     X_172 := bat.setKey(X_171,true);
     (X_174,r1_182,r2_182) := algebra.subsort(X_172,false,false);
     X_179 := algebra.projection(r1_182,X_172);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic