Changeset: e41b4cacf552 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e41b4cacf552
Modified Files:
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/06-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
Branch: default
Log Message:
Approvals.
diffs (truncated from 514 to 300 lines):
diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out
b/sql/benchmarks/tpch/Tests/01-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out
@@ -50,9 +50,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 620 # length
+% 622 # length
function user.s2_1{autoCommit=true}(A0:bte,A1:bte,A2:bte,A3:date,A4:lng):void;
- X_166:void := querylog.define("explain
select\n\tl_returnflag,\n\tl_linestatus,\n\tsum(l_quantity) as
sum_qty,\n\tsum(l_extendedprice) as sum_base_price,\n\tsum(l_extendedprice * (1
- l_discount)) as sum_disc_price,\n\tsum(l_extendedprice * (1 - l_discount) *
(1 + l_tax)) as sum_charge,\n\tavg(l_quantity) as
avg_qty,\n\tavg(l_extendedprice) as avg_price,\n\tavg(l_discount) as
avg_disc,\n\tcount(*) as count_order\nfrom\n\tlineitem\nwhere\n\tl_shipdate <=
date \\'1998-12-01\\' - interval \\'90\\' day (3)\ngroup
by\n\tl_returnflag,\n\tl_linestatus\norder
by\n\tl_returnflag,\n\tl_linestatus;","sequential_pipe");
+ X_166:void := querylog.define("explain
select\n\tl_returnflag,\n\tl_linestatus,\n\tsum(l_quantity) as
sum_qty,\n\tsum(l_extendedprice) as sum_base_price,\n\tsum(l_extendedprice * (1
- l_discount)) as sum_disc_price,\n\tsum(l_extendedprice * (1 - l_discount) *
(1 + l_tax)) as sum_charge,\n\tavg(l_quantity) as
avg_qty,\n\tavg(l_extendedprice) as avg_price,\n\tavg(l_discount) as
avg_disc,\n\tcount(*) as count_order\nfrom\n\tlineitem\nwhere\n\tl_shipdate <=
date \\'1998-12-01\\' - interval \\'90\\' day (3)\ngroup
by\n\tl_returnflag,\n\tl_linestatus\norder
by\n\tl_returnflag,\n\tl_linestatus;","sequential_pipe",86);
X_7 := sql.mvc();
X_11:bat[:oid,:date] := sql.bind(X_7,"sys","lineitem","l_shipdate",0);
X_8:bat[:oid,:oid] := sql.tid(X_7,"sys","lineitem");
diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
@@ -50,9 +50,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 620 # length
+% 622 # length
function user.s2_1{autoCommit=true}(A0:bte,A1:bte,A2:bte,A3:date,A4:lng):void;
- X_165:void := querylog.define("explain
select\n\tl_returnflag,\n\tl_linestatus,\n\tsum(l_quantity) as
sum_qty,\n\tsum(l_extendedprice) as sum_base_price,\n\tsum(l_extendedprice * (1
- l_discount)) as sum_disc_price,\n\tsum(l_extendedprice * (1 - l_discount) *
(1 + l_tax)) as sum_charge,\n\tavg(l_quantity) as
avg_qty,\n\tavg(l_extendedprice) as avg_price,\n\tavg(l_discount) as
avg_disc,\n\tcount(*) as count_order\nfrom\n\tlineitem\nwhere\n\tl_shipdate <=
date \\'1998-12-01\\' - interval \\'90\\' day (3)\ngroup
by\n\tl_returnflag,\n\tl_linestatus\norder
by\n\tl_returnflag,\n\tl_linestatus;","sequential_pipe");
+ X_165:void := querylog.define("explain
select\n\tl_returnflag,\n\tl_linestatus,\n\tsum(l_quantity) as
sum_qty,\n\tsum(l_extendedprice) as sum_base_price,\n\tsum(l_extendedprice * (1
- l_discount)) as sum_disc_price,\n\tsum(l_extendedprice * (1 - l_discount) *
(1 + l_tax)) as sum_charge,\n\tavg(l_quantity) as
avg_qty,\n\tavg(l_extendedprice) as avg_price,\n\tavg(l_discount) as
avg_disc,\n\tcount(*) as count_order\nfrom\n\tlineitem\nwhere\n\tl_shipdate <=
date \\'1998-12-01\\' - interval \\'90\\' day (3)\ngroup
by\n\tl_returnflag,\n\tl_linestatus\norder
by\n\tl_returnflag,\n\tl_linestatus;","sequential_pipe",86);
X_7 := sql.mvc();
X_11:bat[:oid,:date] := sql.bind(X_7,"sys","lineitem","l_shipdate",0);
X_8:bat[:oid,:oid] := sql.tid(X_7,"sys","lineitem");
diff --git a/sql/benchmarks/tpch/Tests/03-explain.stable.out
b/sql/benchmarks/tpch/Tests/03-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/03-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/03-explain.stable.out
@@ -52,9 +52,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 514 # length
+% 516 # length
function user.s2_1{autoCommit=true}(A0:bte,A1:str,A2:date,A3:date):void;
- X_163:void := querylog.define("explain
select\n\tl_orderkey,\n\tsum(l_extendedprice * (1 - l_discount)) as
revenue,\n\to_orderdate,\n\to_shippriority\nfrom\n\tcustomer,\n\torders,\n\tlineitem\nwhere\n\tc_mktsegment
= \\'BUILDING\\'\n\tand c_custkey = o_custkey\n\tand l_orderkey =
o_orderkey\n\tand o_orderdate < date \\'1995-03-15\\'\n\tand l_shipdate > date
\\'1995-03-15\\'\ngroup
by\n\tl_orderkey,\n\to_orderdate,\n\to_shippriority\norder by\n\trevenue
desc,\n\to_orderdate\nlimit 10;","sequential_pipe");
+ X_163:void := querylog.define("explain
select\n\tl_orderkey,\n\tsum(l_extendedprice * (1 - l_discount)) as
revenue,\n\to_orderdate,\n\to_shippriority\nfrom\n\tcustomer,\n\torders,\n\tlineitem\nwhere\n\tc_mktsegment
= \\'BUILDING\\'\n\tand c_custkey = o_custkey\n\tand l_orderkey =
o_orderkey\n\tand o_orderdate < date \\'1995-03-15\\'\n\tand l_shipdate > date
\\'1995-03-15\\'\ngroup
by\n\tl_orderkey,\n\to_orderdate,\n\to_shippriority\norder by\n\trevenue
desc,\n\to_orderdate\nlimit 10;","sequential_pipe",93);
X_6 := sql.mvc();
X_10:bat[:oid,:date] := sql.bind(X_6,"sys","orders","o_orderdate",0);
X_7:bat[:oid,:oid] := sql.tid(X_6,"sys","orders");
@@ -132,7 +132,7 @@ function user.s2_1{autoCommit=true}(A0:b
(X_132,r1_165,r2_165) := algebra.subsort(X_127,r1_162,r2_162,false,false);
X_205 := algebra.leftfetchjoin(r1_165,X_126);
X_135:bat[:oid,:int] := algebra.leftfetchjoinPath(X_205,r1_112,X_86);
- X_137 := algebra.subslice(X_135,0:wrd,9:wrd);
+ X_137 := algebra.subslice(X_135,0,9:wrd);
X_206 := algebra.leftfetchjoin(X_137,r1_165);
X_141:bat[:oid,:int] :=
algebra.leftfetchjoinPath(X_206,X_126,r1_112,X_75);
X_138 := algebra.leftfetchjoin(X_137,X_135);
diff --git a/sql/benchmarks/tpch/Tests/05-explain.stable.out
b/sql/benchmarks/tpch/Tests/05-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/05-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/05-explain.stable.out
@@ -53,9 +53,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 589 # length
+% 591 # length
function user.s2_1{autoCommit=true}(A0:bte,A1:str,A2:date,A3:date,A4:int):void;
- X_182:void := querylog.define("explain
select\n\tn_name,\n\tsum(l_extendedprice * (1 - l_discount)) as
revenue\nfrom\n\tcustomer,\n\torders,\n\tlineitem,\n\tsupplier,\n\tnation,\n\tregion\nwhere\n\tc_custkey
= o_custkey\n\tand l_orderkey = o_orderkey\n\tand l_suppkey = s_suppkey\n\tand
c_nationkey = s_nationkey\n\tand s_nationkey = n_nationkey\n\tand n_regionkey =
r_regionkey\n\tand r_name = \\'ASIA\\'\n\tand o_orderdate >= date
\\'1994-01-01\\'\n\tand o_orderdate < date \\'1994-01-01\\' + interval \\'1\\'
year\ngroup by\n\tn_name\norder by\n\trevenue desc;","sequential_pipe");
+ X_182:void := querylog.define("explain
select\n\tn_name,\n\tsum(l_extendedprice * (1 - l_discount)) as
revenue\nfrom\n\tcustomer,\n\torders,\n\tlineitem,\n\tsupplier,\n\tnation,\n\tregion\nwhere\n\tc_custkey
= o_custkey\n\tand l_orderkey = o_orderkey\n\tand l_suppkey = s_suppkey\n\tand
c_nationkey = s_nationkey\n\tand s_nationkey = n_nationkey\n\tand n_regionkey =
r_regionkey\n\tand r_name = \\'ASIA\\'\n\tand o_orderdate >= date
\\'1994-01-01\\'\n\tand o_orderdate < date \\'1994-01-01\\' + interval \\'1\\'
year\ngroup by\n\tn_name\norder by\n\trevenue desc;","sequential_pipe",99);
X_7 := sql.mvc();
X_11:bat[:oid,:date] := sql.bind(X_7,"sys","orders","o_orderdate",0);
X_8:bat[:oid,:oid] := sql.tid(X_7,"sys","orders");
diff --git a/sql/benchmarks/tpch/Tests/06-explain.stable.out
b/sql/benchmarks/tpch/Tests/06-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/06-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/06-explain.stable.out
@@ -38,37 +38,37 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 326 # length
+% 328 # length
function
user.s2_1{autoCommit=true}(A0:date,A1:date,A2:int,A3:sht,A4:sht,A5:sht,A6:sht,A7:int):void;
- X_66:void := querylog.define("explain select\n\tsum(l_extendedprice *
l_discount) as revenue\nfrom\n\tlineitem\nwhere\n\tl_shipdate >= date
\\'1994-01-01\\'\n\tand l_shipdate < date \\'1994-01-01\\' + interval \\'1\\'
year\n\tand l_discount between 0.06 - 0.01 and 0.06 + 0.01\n\tand l_quantity <
24;","sequential_pipe");
+ X_66:void := querylog.define("explain select\n\tsum(l_extendedprice *
l_discount) as revenue\nfrom\n\tlineitem\nwhere\n\tl_shipdate >= date
\\'1994-01-01\\'\n\tand l_shipdate < date \\'1994-01-01\\' + interval \\'1\\'
year\n\tand l_discount between 0.06 - 0.01 and 0.06 + 0.01\n\tand l_quantity <
24;","sequential_pipe",39);
X_10 := sql.mvc();
X_14:bat[:oid,:lng] := sql.bind(X_10,"sys","lineitem","l_discount",0);
- X_27:bat[:oid,:int] := sql.bind(X_10,"sys","lineitem","l_quantity",0);
- X_32:bat[:oid,:date] := sql.bind(X_10,"sys","lineitem","l_shipdate",0);
+ X_27:bat[:oid,:date] := sql.bind(X_10,"sys","lineitem","l_shipdate",0);
+ X_33:bat[:oid,:int] := sql.bind(X_10,"sys","lineitem","l_quantity",0);
X_11:bat[:oid,:oid] := sql.tid(X_10,"sys","lineitem");
- X_39 := mtime.addmonths(A1,A2);
- X_82 := algebra.subselect(X_32,X_11,A0,X_39,true,false,false);
- (X_34,r1_43) := sql.bind(X_10,"sys","lineitem","l_shipdate",2);
- X_83 :=
algebra.subselect(r1_43,nil:bat[:oid,:oid],A0,X_39,true,false,false);
- X_38:bat[:oid,:date] := sql.bind(X_10,"sys","lineitem","l_shipdate",1);
- X_85 := algebra.subselect(X_38,X_11,A0,X_39,true,false,false);
- X_40 := sql.subdelta(X_82,X_11,X_34,X_83,X_85);
- X_86 := algebra.thetasubselect(X_27,X_40,A7,"<");
- (X_29,r1_35) := sql.bind(X_10,"sys","lineitem","l_quantity",2);
- X_87 := algebra.thetasubselect(r1_35,nil:bat[:oid,:oid],A7,"<");
- X_31:bat[:oid,:int] := sql.bind(X_10,"sys","lineitem","l_quantity",1);
- X_89 := algebra.thetasubselect(X_31,X_40,A7,"<");
- X_43 := sql.subdelta(X_86,X_40,X_29,X_87,X_89);
+ X_82 := algebra.thetasubselect(X_33,X_11,A7,"<");
+ (X_37,r1_48) := sql.bind(X_10,"sys","lineitem","l_quantity",2);
+ X_83 := algebra.thetasubselect(r1_48,nil:bat[:oid,:oid],A7,"<");
+ X_39:bat[:oid,:int] := sql.bind(X_10,"sys","lineitem","l_quantity",1);
+ X_85 := algebra.thetasubselect(X_39,X_11,A7,"<");
+ X_40 := sql.subdelta(X_82,X_11,X_37,X_83,X_85);
+ X_32 := mtime.addmonths(A1,A2);
+ X_86 := algebra.subselect(X_27,X_40,A0,X_32,true,false,false);
+ (X_29,r1_35) := sql.bind(X_10,"sys","lineitem","l_shipdate",2);
+ X_87 :=
algebra.subselect(r1_35,nil:bat[:oid,:oid],A0,X_32,true,false,false);
+ X_31:bat[:oid,:date] := sql.bind(X_10,"sys","lineitem","l_shipdate",1);
+ X_89 := algebra.subselect(X_31,X_40,A0,X_32,true,false,false);
+ X_42 := sql.subdelta(X_86,X_40,X_29,X_87,X_89);
X_22 := calc.-(A3,A4);
X_23 := calc.lng(2,X_22,15,2);
X_25 := calc.+(A5,A6);
X_26 := calc.lng(2,X_25,15,2);
- X_90 := algebra.subselect(X_14,X_43,X_23,X_26,true,true,false);
+ X_90 := algebra.subselect(X_14,X_42,X_23,X_26,true,true,false);
(X_17,r1_17) := sql.bind(X_10,"sys","lineitem","l_discount",2);
X_91 :=
algebra.subselect(r1_17,nil:bat[:oid,:oid],X_23,X_26,true,true,false);
X_20:bat[:oid,:lng] := sql.bind(X_10,"sys","lineitem","l_discount",1);
- X_93 := algebra.subselect(X_20,X_43,X_23,X_26,true,true,false);
- X_45 := sql.subdelta(X_90,X_43,X_17,X_91,X_93);
+ X_93 := algebra.subselect(X_20,X_42,X_23,X_26,true,true,false);
+ X_45 := sql.subdelta(X_90,X_42,X_17,X_91,X_93);
X_46:bat[:oid,:lng] :=
sql.bind(X_10,"sys","lineitem","l_extendedprice",0);
(X_49,r1_63) := sql.bind(X_10,"sys","lineitem","l_extendedprice",2);
X_52:bat[:oid,:lng] :=
sql.bind(X_10,"sys","lineitem","l_extendedprice",1);
@@ -76,7 +76,7 @@ function user.s2_1{autoCommit=true}(A0:d
X_55 := sql.projectdelta(X_45,X_14,X_17,r1_17,X_20);
X_56:bat[:oid,:lng] := batcalc.*(X_54,X_55);
X_57:lng := aggr.sum(X_56);
- sql.exportValue(1,"sys.L1","revenue","decimal",19,4,9,X_57,"");
+ sql.exportValue(1,"sys.L1","revenue","decimal",19,4,10,X_57,"");
end user.s2_1;
# 22:53:26 >
diff --git a/sql/benchmarks/tpch/Tests/07-explain.stable.out
b/sql/benchmarks/tpch/Tests/07-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/07-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/07-explain.stable.out
@@ -56,9 +56,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 985 # length
+% 988 # length
function
user.s2_1{autoCommit=true}(A0:bte,A1:str,A2:str,A3:str,A4:str,A5:date,A6:date):void;
- X_197:void := querylog.define("explain
select\n\tsupp_nation,\n\tcust_nation,\n\tl_year,\n\tsum(volume) as
revenue\nfrom\n\t(\n\t\tselect\n\t\t\tn1.n_name as
supp_nation,\n\t\t\tn2.n_name as cust_nation,\n\t\t\textract(year from
l_shipdate) as l_year,\n\t\t\tl_extendedprice * (1 - l_discount) as
volume\n\t\tfrom\n\t\t\tsupplier,\n\t\t\tlineitem,\n\t\t\torders,\n\t\t\tcustomer,\n\t\t\tnation
n1,\n\t\t\tnation n2\n\t\twhere\n\t\t\ts_suppkey = l_suppkey\n\t\t\tand
o_orderkey = l_orderkey\n\t\t\tand c_custkey = o_custkey\n\t\t\tand s_nationkey
= n1.n_nationkey\n\t\t\tand c_nationkey = n2.n_nationkey\n\t\t\tand
(\n\t\t\t\t(n1.n_name = \\'FRANCE\\' and n2.n_name = \\'GERMANY\\')\n\t\t\t\tor
(n1.n_name = \\'GERMANY\\' and n2.n_name = \\'FRANCE\\')\n\t\t\t)\n\t\t\tand
l_shipdate between date \\'1995-01-01\\' and date \\'1996-12-31\\'\n\t) as
shipping\ngroup by\n\tsupp_nation,\n\tcust_nation,\n\tl_year\norder
by\n\tsupp_nation,\n\tcust_nation,\n\tl_year;","sequential_pipe");
+ X_197:void := querylog.define("explain
select\n\tsupp_nation,\n\tcust_nation,\n\tl_year,\n\tsum(volume) as
revenue\nfrom\n\t(\n\t\tselect\n\t\t\tn1.n_name as
supp_nation,\n\t\t\tn2.n_name as cust_nation,\n\t\t\textract(year from
l_shipdate) as l_year,\n\t\t\tl_extendedprice * (1 - l_discount) as
volume\n\t\tfrom\n\t\t\tsupplier,\n\t\t\tlineitem,\n\t\t\torders,\n\t\t\tcustomer,\n\t\t\tnation
n1,\n\t\t\tnation n2\n\t\twhere\n\t\t\ts_suppkey = l_suppkey\n\t\t\tand
o_orderkey = l_orderkey\n\t\t\tand c_custkey = o_custkey\n\t\t\tand s_nationkey
= n1.n_nationkey\n\t\t\tand c_nationkey = n2.n_nationkey\n\t\t\tand
(\n\t\t\t\t(n1.n_name = \\'FRANCE\\' and n2.n_name = \\'GERMANY\\')\n\t\t\t\tor
(n1.n_name = \\'GERMANY\\' and n2.n_name = \\'FRANCE\\')\n\t\t\t)\n\t\t\tand
l_shipdate between date \\'1995-01-01\\' and date \\'1996-12-31\\'\n\t) as
shipping\ngroup by\n\tsupp_nation,\n\tcust_nation,\n\tl_year\norder
by\n\tsupp_nation,\n\tcust_nation,\n\tl_year;","sequential_pipe",109);
X_9 := sql.mvc();
X_10:bat[:oid,:oid] := sql.tid(X_9,"sys","lineitem");
X_13:bat[:oid,:date] := sql.bind(X_9,"sys","lineitem","l_shipdate",0);
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
@@ -57,9 +57,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 960 # length
+% 963 # length
function
user.s2_1{autoCommit=true}(A0:str,A1:bte,A2:bte,A3:str,A4:date,A5:date,A6:str):void;
- X_217:void := querylog.define("explain
select\n\to_year,\n\tsum(case\n\t\twhen nation = \\'BRAZIL\\' then
volume\n\t\telse 0\n\tend) / sum(volume) as
mkt_share\nfrom\n\t(\n\t\tselect\n\t\t\textract(year from o_orderdate) as
o_year,\n\t\t\tl_extendedprice * (1 - l_discount) as volume,\n\t\t\tn2.n_name
as
nation\n\t\tfrom\n\t\t\tpart,\n\t\t\tsupplier,\n\t\t\tlineitem,\n\t\t\torders,\n\t\t\tcustomer,\n\t\t\tnation
n1,\n\t\t\tnation n2,\n\t\t\tregion\n\t\twhere\n\t\t\tp_partkey =
l_partkey\n\t\t\tand s_suppkey = l_suppkey\n\t\t\tand l_orderkey =
o_orderkey\n\t\t\tand o_custkey = c_custkey\n\t\t\tand c_nationkey =
n1.n_nationkey\n\t\t\tand n1.n_regionkey = r_regionkey\n\t\t\tand r_name =
\\'AMERICA\\'\n\t\t\tand s_nationkey = n2.n_nationkey\n\t\t\tand o_orderdate
between date \\'1995-01-01\\' and date \\'1996-12-31\\'\n\t\t\tand p_type =
\\'ECONOMY ANODIZED STEEL\\'\n\t) as all_nations\ngroup by\n\to_year\norder
by\n\to_year;","sequential_pipe");
+ X_217:void := querylog.define("explain
select\n\to_year,\n\tsum(case\n\t\twhen nation = \\'BRAZIL\\' then
volume\n\t\telse 0\n\tend) / sum(volume) as
mkt_share\nfrom\n\t(\n\t\tselect\n\t\t\textract(year from o_orderdate) as
o_year,\n\t\t\tl_extendedprice * (1 - l_discount) as volume,\n\t\t\tn2.n_name
as
nation\n\t\tfrom\n\t\t\tpart,\n\t\t\tsupplier,\n\t\t\tlineitem,\n\t\t\torders,\n\t\t\tcustomer,\n\t\t\tnation
n1,\n\t\t\tnation n2,\n\t\t\tregion\n\t\twhere\n\t\t\tp_partkey =
l_partkey\n\t\t\tand s_suppkey = l_suppkey\n\t\t\tand l_orderkey =
o_orderkey\n\t\t\tand o_custkey = c_custkey\n\t\t\tand c_nationkey =
n1.n_nationkey\n\t\t\tand n1.n_regionkey = r_regionkey\n\t\t\tand r_name =
\\'AMERICA\\'\n\t\t\tand s_nationkey = n2.n_nationkey\n\t\t\tand o_orderdate
between date \\'1995-01-01\\' and date \\'1996-12-31\\'\n\t\t\tand p_type =
\\'ECONOMY ANODIZED STEEL\\'\n\t) as all_nations\ngroup by\n\to_year\norder
by\n\to_year;","sequential_pipe",119);
X_9 := sql.mvc();
X_10:bat[:oid,:oid] := sql.tid(X_9,"sys","lineitem");
X_13:bat[:oid,:oid] :=
sql.bind_idxbat(X_9,"sys","lineitem","lineitem_l_orderkey_fkey",0);
diff --git a/sql/benchmarks/tpch/Tests/09-explain.stable.out
b/sql/benchmarks/tpch/Tests/09-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/09-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/09-explain.stable.out
@@ -55,9 +55,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 736 # length
+% 739 # length
function user.s2_1{autoCommit=true}(A0:bte,A1:str):void;
- X_198:void := querylog.define("explain
select\n\tnation,\n\to_year,\n\tsum(amount) as
sum_profit\nfrom\n\t(\n\t\tselect\n\t\t\tn_name as nation,\n\t\t\textract(year
from o_orderdate) as o_year,\n\t\t\tl_extendedprice * (1 - l_discount) -
ps_supplycost * l_quantity as
amount\n\t\tfrom\n\t\t\tpart,\n\t\t\tsupplier,\n\t\t\tlineitem,\n\t\t\tpartsupp,\n\t\t\torders,\n\t\t\tnation\n\t\twhere\n\t\t\ts_suppkey
= l_suppkey\n\t\t\tand ps_suppkey = l_suppkey\n\t\t\tand ps_partkey =
l_partkey\n\t\t\tand p_partkey = l_partkey\n\t\t\tand o_orderkey =
l_orderkey\n\t\t\tand s_nationkey = n_nationkey\n\t\t\tand p_name like
\\'%green%\\'\n\t) as profit\ngroup by\n\tnation,\n\to_year\norder
by\n\tnation,\n\to_year desc;","sequential_pipe");
+ X_198:void := querylog.define("explain
select\n\tnation,\n\to_year,\n\tsum(amount) as
sum_profit\nfrom\n\t(\n\t\tselect\n\t\t\tn_name as nation,\n\t\t\textract(year
from o_orderdate) as o_year,\n\t\t\tl_extendedprice * (1 - l_discount) -
ps_supplycost * l_quantity as
amount\n\t\tfrom\n\t\t\tpart,\n\t\t\tsupplier,\n\t\t\tlineitem,\n\t\t\tpartsupp,\n\t\t\torders,\n\t\t\tnation\n\t\twhere\n\t\t\ts_suppkey
= l_suppkey\n\t\t\tand ps_suppkey = l_suppkey\n\t\t\tand ps_partkey =
l_partkey\n\t\t\tand p_partkey = l_partkey\n\t\t\tand o_orderkey =
l_orderkey\n\t\t\tand s_nationkey = n_nationkey\n\t\t\tand p_name like
\\'%green%\\'\n\t) as profit\ngroup by\n\tnation,\n\to_year\norder
by\n\tnation,\n\to_year desc;","sequential_pipe",104);
X_4 := sql.mvc();
X_5:bat[:oid,:oid] := sql.tid(X_4,"sys","lineitem");
X_8:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineitem","lineitem_l_partkey_fkey",0);
@@ -145,7 +145,7 @@ function user.s2_1{autoCommit=true}(A0:b
X_169 := sql.projectdelta(X_5,X_163,X_166,r1_202,X_168);
X_170:bat[:oid,:int] :=
algebra.leftfetchjoinPath(X_244,X_57,X_43,X_29,X_169);
X_171:bat[:oid,:lng] := batcalc.*(X_162,X_170);
- X_173:bat[:oid,:lng] := batcalc.*(X_171,100:lng);
+ X_173:bat[:oid,:lng] := batcalc.*(X_171,100);
X_174:bat[:oid,:lng] := batcalc.-(X_150,X_173);
X_175:bat[:oid,:lng] := aggr.subsum(X_174,X_113,r1_132,true,true);
(X_118,r1_137,r2_137) := algebra.subsort(X_117,false,false);
diff --git a/sql/benchmarks/tpch/Tests/10-explain.stable.out
b/sql/benchmarks/tpch/Tests/10-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/10-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/10-explain.stable.out
@@ -61,9 +61,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 642 # length
+% 645 # length
function user.s2_1{autoCommit=true}(A0:bte,A1:date,A2:date,A3:int,A4:str):void;
- X_217:void := querylog.define("explain
select\n\tc_custkey,\n\tc_name,\n\tsum(l_extendedprice * (1 - l_discount)) as
revenue,\n\tc_acctbal,\n\tn_name,\n\tc_address,\n\tc_phone,\n\tc_comment\nfrom\n\tcustomer,\n\torders,\n\tlineitem,\n\tnation\nwhere\n\tc_custkey
= o_custkey\n\tand l_orderkey = o_orderkey\n\tand o_orderdate >= date
\\'1993-10-01\\'\n\tand o_orderdate < date \\'1993-10-01\\' + interval \\'3\\'
month\n\tand l_returnflag = \\'R\\'\n\tand c_nationkey = n_nationkey\ngroup
by\n\tc_custkey,\n\tc_name,\n\tc_acctbal,\n\tc_phone,\n\tn_name,\n\tc_address,\n\tc_comment\norder
by\n\trevenue desc\nlimit 20;","sequential_pipe");
+ X_217:void := querylog.define("explain
select\n\tc_custkey,\n\tc_name,\n\tsum(l_extendedprice * (1 - l_discount)) as
revenue,\n\tc_acctbal,\n\tn_name,\n\tc_address,\n\tc_phone,\n\tc_comment\nfrom\n\tcustomer,\n\torders,\n\tlineitem,\n\tnation\nwhere\n\tc_custkey
= o_custkey\n\tand l_orderkey = o_orderkey\n\tand o_orderdate >= date
\\'1993-10-01\\'\n\tand o_orderdate < date \\'1993-10-01\\' + interval \\'3\\'
month\n\tand l_returnflag = \\'R\\'\n\tand c_nationkey = n_nationkey\ngroup
by\n\tc_custkey,\n\tc_name,\n\tc_acctbal,\n\tc_phone,\n\tn_name,\n\tc_address,\n\tc_comment\norder
by\n\trevenue desc\nlimit 20;","sequential_pipe",117);
X_7 := sql.mvc();
X_11:bat[:oid,:str] := sql.bind(X_7,"sys","lineitem","l_returnflag",0);
X_8:bat[:oid,:oid] := sql.tid(X_7,"sys","lineitem");
@@ -137,7 +137,7 @@ function user.s2_1{autoCommit=true}(A0:b
(X_129,r1_169,r2_169) := algebra.subsort(X_128,true,false);
X_263 := algebra.leftfetchjoin(r1_169,X_126);
X_132:bat[:oid,:int] := algebra.leftfetchjoinPath(X_263,X_94,X_93);
- X_134 := algebra.subslice(X_132,0:wrd,19:wrd);
+ X_134 := algebra.subslice(X_132,0,19:wrd);
X_264 := algebra.leftfetchjoin(X_134,r1_169);
X_155:bat[:oid,:str] :=
algebra.leftfetchjoinPath(X_264,X_126,X_94,r1_106,X_76);
X_135 := algebra.leftfetchjoin(X_134,X_132);
diff --git a/sql/benchmarks/tpch/Tests/11-explain.stable.out
b/sql/benchmarks/tpch/Tests/11-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/11-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/11-explain.stable.out
@@ -56,9 +56,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 732 # length
+% 734 # length
function user.s2_1{autoCommit=true}(A0:str,A1:sht,A2:str):void;
- X_132:void := querylog.define("explain
select\n\tps_partkey,\n\tsum(ps_supplycost * ps_availqty) as
value\nfrom\n\tpartsupp,\n\tsupplier,\n\tnation\nwhere\n\tps_suppkey =
s_suppkey\n\tand s_nationkey = n_nationkey\n\tand n_name = \\'GERMANY\\'\ngroup
by\n\tps_partkey \nhaving\n\tsum(ps_supplycost * ps_availqty)
>\n\t(\n\t\tselect\n\t\t\tsum(ps_supplycost * ps_availqty) *
0.0100000000\n\t\t\t-- The above constant needs to be adjusted
according\n\t\t\t-- to the scale factor (SF): constant = 0.0001 /
SF.\n\t\tfrom\n\t\t\tpartsupp,\n\t\t\tsupplier,\n\t\t\tnation\n\t\twhere\n\t\t\tps_suppkey
= s_suppkey\n\t\t\tand s_nationkey = n_nationkey\n\t\t\tand n_name =
\\'GERMANY\\'\n\t)\norder by\n\tvalue desc;","sequential_pipe");
+ X_132:void := querylog.define("explain
select\n\tps_partkey,\n\tsum(ps_supplycost * ps_availqty) as
value\nfrom\n\tpartsupp,\n\tsupplier,\n\tnation\nwhere\n\tps_suppkey =
s_suppkey\n\tand s_nationkey = n_nationkey\n\tand n_name = \\'GERMANY\\'\ngroup
by\n\tps_partkey \nhaving\n\tsum(ps_supplycost * ps_availqty)
>\n\t(\n\t\tselect\n\t\t\tsum(ps_supplycost * ps_availqty) *
0.0100000000\n\t\t\t-- The above constant needs to be adjusted
according\n\t\t\t-- to the scale factor (SF): constant = 0.0001 /
SF.\n\t\tfrom\n\t\t\tpartsupp,\n\t\t\tsupplier,\n\t\t\tnation\n\t\twhere\n\t\t\tps_suppkey
= s_suppkey\n\t\t\tand s_nationkey = n_nationkey\n\t\t\tand n_name =
\\'GERMANY\\'\n\t)\norder by\n\tvalue desc;","sequential_pipe",72);
X_5 := sql.mvc();
X_6:bat[:oid,:oid] := sql.tid(X_5,"sys","supplier");
X_9:bat[:oid,:oid] :=
sql.bind_idxbat(X_5,"sys","supplier","supplier_s_nationkey_fkey",0);
@@ -116,7 +116,7 @@ function user.s2_1{autoCommit=true}(A0:s
X_98:lng := aggr.sum(X_97);
X_99 := calc.*(X_98,A1);
X_100 := sql.single(X_99);
- X_102:bat[:oid,:lng] := batsql.dec_round(X_100,100:lng);
+ X_102:bat[:oid,:lng] := batsql.dec_round(X_100,100);
(X_103,r1_162) :=
algebra.subthetajoin(X_82,X_102,nil:BAT,nil:BAT,1,true,nil:lng);
X_108 := algebra.tinter(X_62,X_103);
X_109 := algebra.leftfetchjoin(X_108,X_82);
diff --git a/sql/benchmarks/tpch/Tests/14-explain.stable.out
b/sql/benchmarks/tpch/Tests/14-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/14-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/14-explain.stable.out
@@ -42,9 +42,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 422 # length
+% 424 # length
function
user.s2_1{autoCommit=true}(A0:sht,A1:str,A2:bte,A3:bte,A4:bte,A5:date,A6:date,A7:int):void;
- X_92:void := querylog.define("explain select\n\t100.00 *
sum(case\n\t\twhen p_type like \\'PROMO%\\'\n\t\t\tthen l_extendedprice * (1 -
l_discount)\n\t\telse 0\n\tend) / sum(l_extendedprice * (1 - l_discount)) as
promo_revenue\nfrom\n\tlineitem,\n\tpart\nwhere\n\tl_partkey = p_partkey\n\tand
l_shipdate >= date \\'1995-09-01\\'\n\tand l_shipdate < date \\'1995-09-01\\' +
interval \\'1\\' month;","sequential_pipe");
+ X_92:void := querylog.define("explain select\n\t100.00 *
sum(case\n\t\twhen p_type like \\'PROMO%\\'\n\t\t\tthen l_extendedprice * (1 -
l_discount)\n\t\telse 0\n\tend) / sum(l_extendedprice * (1 - l_discount)) as
promo_revenue\nfrom\n\tlineitem,\n\tpart\nwhere\n\tl_partkey = p_partkey\n\tand
l_shipdate >= date \\'1995-09-01\\'\n\tand l_shipdate < date \\'1995-09-01\\' +
interval \\'1\\' month;","sequential_pipe",51);
X_10 := sql.mvc();
X_14:bat[:oid,:date] := sql.bind(X_10,"sys","lineitem","l_shipdate",0);
X_11:bat[:oid,:oid] := sql.tid(X_10,"sys","lineitem");
@@ -92,7 +92,7 @@ function user.s2_1{autoCommit=true}(A0:s
X_82:lng := aggr.sum(X_81);
X_83 := calc./(X_76,X_82);
X_84 := calc.*(A0,X_83);
- sql.exportValue(1,".L2","promo_revenue","decimal",19,2,9,X_84,"");
+ sql.exportValue(1,".L2","promo_revenue","decimal",19,2,10,X_84,"");
end user.s2_1;
# 22:53:29 >
diff --git a/sql/benchmarks/tpch/Tests/15-explain.stable.out
b/sql/benchmarks/tpch/Tests/15-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/15-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/15-explain.stable.out
@@ -59,9 +59,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 322 # length
+% 324 # length
function user.s3_1{autoCommit=true}():void;
- X_144:void := querylog.define("explain
select\n\ts_suppkey,\n\ts_name,\n\ts_address,\n\ts_phone,\n\ttotal_revenue\nfrom\n\tsupplier,\n\trevenue0\nwhere\n\ts_suppkey
= supplier_no\n\tand total_revenue =
(\n\t\tselect\n\t\t\tmax(total_revenue)\n\t\tfrom\n\t\t\trevenue0\n\t)\norder
by\n\ts_suppkey;","sequential_pipe");
+ X_144:void := querylog.define("explain
select\n\ts_suppkey,\n\ts_name,\n\ts_address,\n\ts_phone,\n\ttotal_revenue\nfrom\n\tsupplier,\n\trevenue0\nwhere\n\ts_suppkey
= supplier_no\n\tand total_revenue =
(\n\t\tselect\n\t\t\tmax(total_revenue)\n\t\tfrom\n\t\t\trevenue0\n\t)\norder
by\n\ts_suppkey;","sequential_pipe",77);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","supplier");
X_6:bat[:oid,:int] := sql.bind(X_2,"sys","supplier","s_suppkey",0);
diff --git a/sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
b/sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
@@ -59,9 +59,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 595 # length
+% 598 # length
function
user.s2_1{autoCommit=true}(A0:str,A1:str,A2:int,A3:int,A4:int,A5:int,A6:int,A7:int,A8:int,A9:int,A10:str):void;
- X_186:void := querylog.define("explain
select\n\tp_brand,\n\tp_type,\n\tp_size,\n\tcount(distinct ps_suppkey) as
supplier_cnt\nfrom\n\tpartsupp,\n\tpart\nwhere\n\tp_partkey = ps_partkey\n\tand
p_brand <> \\'Brand#45\\'\n\tand p_type not like \\'MEDIUM POLISHED%\\'\n\tand
p_size in (49, 14, 23, 45, 19, 3, 36, 9)\n\tand ps_suppkey not in
(\n\t\tselect\n\t\t\ts_suppkey\n\t\tfrom\n\t\t\tsupplier\n\t\twhere\n\t\t\ts_comment
like \\'%Customer%Complaints%\\'\n\t)\ngroup
by\n\tp_brand,\n\tp_type,\n\tp_size\norder by\n\tsupplier_cnt
desc,\n\tp_brand,\n\tp_type,\n\tp_size;","sequential_pipe");
+ X_186:void := querylog.define("explain
select\n\tp_brand,\n\tp_type,\n\tp_size,\n\tcount(distinct ps_suppkey) as
supplier_cnt\nfrom\n\tpartsupp,\n\tpart\nwhere\n\tp_partkey = ps_partkey\n\tand
p_brand <> \\'Brand#45\\'\n\tand p_type not like \\'MEDIUM POLISHED%\\'\n\tand
p_size in (49, 14, 23, 45, 19, 3, 36, 9)\n\tand ps_suppkey not in
(\n\t\tselect\n\t\t\ts_suppkey\n\t\tfrom\n\t\t\tsupplier\n\t\twhere\n\t\t\ts_comment
like \\'%Customer%Complaints%\\'\n\t)\ngroup
by\n\tp_brand,\n\tp_type,\n\tp_size\norder by\n\tsupplier_cnt
desc,\n\tp_brand,\n\tp_type,\n\tp_size;","sequential_pipe",100);
X_13 := sql.mvc();
X_14:bat[:oid,:oid] := sql.tid(X_13,"sys","partsupp");
X_17:bat[:oid,:int] := sql.bind(X_13,"sys","partsupp","ps_suppkey",0);
@@ -95,40 +95,40 @@ function user.s2_1{autoCommit=true}(A0:s
X_70:bat[:oid,:int] := sql.bind(X_13,"sys","part","p_size",1);
X_71 := sql.delta(X_66,X_68,r1_72,X_70);
X_72 := algebra.leftfetchjoin(X_64,X_71);
- X_73:bat[:oid,:str] := sql.bind(X_13,"sys","part","p_type",0);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
