Changeset: 87e9c2656794 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=87e9c2656794
Modified Files:
sql/benchmarks/ssbm/Tests/01-explain.stable.out
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out
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/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/22-explain.stable.out
Branch: default
Log Message:
Approve non 128 bit output.
diffs (truncated from 4460 to 300 lines):
diff --git a/sql/benchmarks/ssbm/Tests/01-explain.stable.out
b/sql/benchmarks/ssbm/Tests/01-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/01-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/01-explain.stable.out
@@ -38,48 +38,47 @@ Ready.
% clob # type
% 265 # length
function user.s2_1{autoCommit=true}(A0:int,A1:int,A2:int,A3:int):void;
- X_71:void := querylog.define("explain\nselect
sum(lo_extendedprice*lo_discount) as revenue\n\tfrom lineorder, dwdate\n\twhere
lo_orderdate = d_datekey\n\t\tand d_year = 1993\n\t\tand lo_discount between 1
and 3\n\t\tand lo_quantity < 25;","sequential_pipe",44);
+ X_63:void := querylog.define("explain\nselect
sum(lo_extendedprice*lo_discount) as revenue\n\tfrom lineorder, dwdate\n\twhere
lo_orderdate = d_datekey\n\t\tand d_year = 1993\n\t\tand lo_discount between 1
and 3\n\t\tand lo_quantity < 25;","sequential_pipe",43);
X_6 := sql.mvc();
X_10:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",0);
X_18:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_discount",0);
- X_7:bat[:oid,:oid] := sql.tid(X_6,"sys","lineorder");
- X_91 := algebra.subselect(X_18,X_7,A1,A2,true,true,false);
- (X_20,r1_23) := sql.bind(X_6,"sys","lineorder","lo_discount",2);
- X_92 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A1,A2,true,true,false);
+ C_7:bat[:oid,:oid] := sql.tid(X_6,"sys","lineorder");
+ C_83 := algebra.subselect(X_18,C_7,A1,A2,true,true,false);
+ (C_20,r1_23) := sql.bind(X_6,"sys","lineorder","lo_discount",2);
+ C_84 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A1,A2,true,true,false);
X_22:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_discount",1);
- X_94 := algebra.subselect(X_22,X_7,A1,A2,true,true,false);
- X_23 := sql.subdelta(X_91,X_7,X_20,X_92,X_94);
- X_95 := algebra.thetasubselect(X_10,X_23,A3,"<");
- (X_13,r1_13) := sql.bind(X_6,"sys","lineorder","lo_quantity",2);
- X_96 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
+ C_86 := algebra.subselect(X_22,C_7,A1,A2,true,true,false);
+ C_23 := sql.subdelta(C_83,C_7,C_20,C_84,C_86);
+ C_87 := algebra.thetasubselect(X_10,C_23,A3,"<");
+ (C_13,r1_13) := sql.bind(X_6,"sys","lineorder","lo_quantity",2);
+ C_88 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
X_16:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",1);
- X_98 := algebra.thetasubselect(X_16,X_23,A3,"<");
- X_25 := sql.subdelta(X_95,X_23,X_13,X_96,X_98);
+ C_89 := algebra.thetasubselect(X_16,C_23,A3,"<");
+ C_25 := sql.subdelta(C_87,C_23,C_13,C_88,C_89);
X_27:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_29,r1_36) :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_31:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
- X_32 := sql.projectdelta(X_25,X_27,X_29,r1_36,X_31);
- X_36:bat[:oid,:int] := sql.bind(X_6,"sys","dwdate","d_year",0);
- X_33:bat[:oid,:oid] := sql.tid(X_6,"sys","dwdate");
- X_99 := algebra.subselect(X_36,X_33,A0,A0,true,false,false);
- (X_39,r1_48) := sql.bind(X_6,"sys","dwdate","d_year",2);
- X_100 :=
algebra.subselect(r1_48,nil:bat[:oid,:oid],A0,A0,true,false,false);
- X_42:bat[:oid,:int] := sql.bind(X_6,"sys","dwdate","d_year",1);
- X_102 := algebra.subselect(X_42,X_33,A0,A0,true,false,false);
- X_44 := sql.subdelta(X_99,X_33,X_39,X_100,X_102);
- X_46 := X_44;
- (X_47,r1_59) := algebra.subjoin(X_32,X_46,nil:BAT,nil:BAT,false,nil:lng);
- X_51:bat[:oid,:int] :=
sql.bind(X_6,"sys","lineorder","lo_extendedprice",0);
- (X_54,r1_66) := sql.bind(X_6,"sys","lineorder","lo_extendedprice",2);
- X_56:bat[:oid,:int] :=
sql.bind(X_6,"sys","lineorder","lo_extendedprice",1);
- X_57 := sql.projectdelta(X_25,X_51,X_54,r1_66,X_56);
- X_58 := algebra.leftfetchjoin(X_47,X_57);
- X_59 := batcalc.lng(X_58);
- X_60 := sql.projectdelta(X_25,X_18,X_20,r1_23,X_22);
- X_61 := algebra.leftfetchjoin(X_47,X_60);
- X_62:bat[:oid,:lng] := batcalc.*(X_59,X_61);
- X_63:lng := aggr.sum(X_62);
- sql.resultSet("sys.L1","revenue","bigint",64,0,7,X_63);
+ X_32 := sql.projectdelta(C_25,X_27,X_29,r1_36,X_31);
+ X_35:bat[:oid,:int] := sql.bind(X_6,"sys","dwdate","d_year",0);
+ C_33:bat[:oid,:oid] := sql.tid(X_6,"sys","dwdate");
+ C_90 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
+ (C_37,r1_46) := sql.bind(X_6,"sys","dwdate","d_year",2);
+ C_91 := algebra.subselect(r1_46,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ X_39:bat[:oid,:int] := sql.bind(X_6,"sys","dwdate","d_year",1);
+ C_92 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
+ C_40 := sql.subdelta(C_90,C_33,C_37,C_91,C_92);
+ (X_41,r1_55) := algebra.subjoin(X_32,C_40,nil:BAT,nil:BAT,false,nil:lng);
+ X_45:bat[:oid,:int] :=
sql.bind(X_6,"sys","lineorder","lo_extendedprice",0);
+ (C_47,r1_62) := sql.bind(X_6,"sys","lineorder","lo_extendedprice",2);
+ X_49:bat[:oid,:int] :=
sql.bind(X_6,"sys","lineorder","lo_extendedprice",1);
+ X_50 := sql.projectdelta(C_25,X_45,C_47,r1_62,X_49);
+ X_51 := algebra.leftfetchjoin(X_41,X_50);
+ X_52 := batcalc.lng(X_51);
+ X_53 := sql.projectdelta(C_25,X_18,C_20,r1_23,X_22);
+ X_54 := algebra.leftfetchjoin(X_41,X_53);
+ X_55:bat[:oid,:lng] := batcalc.*(X_52,X_54);
+ X_56:lng := aggr.sum(X_55);
+ sql.resultSet("sys.L1","revenue","bigint",64,0,7,X_56);
end user.s2_1;
# 23:10:45 >
diff --git a/sql/benchmarks/ssbm/Tests/02-explain.stable.out
b/sql/benchmarks/ssbm/Tests/02-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/02-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/02-explain.stable.out
@@ -38,48 +38,47 @@ Ready.
% clob # type
% 288 # length
function user.s2_1{autoCommit=true}(A0:int,A1:int,A2:int,A3:int,A4:int):void;
- X_71:void := querylog.define("explain\nselect
sum(lo_extendedprice*lo_discount) as revenue\n\tfrom lineorder, dwdate\n\twhere
lo_orderdate = d_datekey\n\t\tand d_yearmonthnum = 199401\n\t\tand lo_discount
between 4 and 6\n\t\tand lo_quantity between 26 and 35;","sequential_pipe",44);
+ X_63:void := querylog.define("explain\nselect
sum(lo_extendedprice*lo_discount) as revenue\n\tfrom lineorder, dwdate\n\twhere
lo_orderdate = d_datekey\n\t\tand d_yearmonthnum = 199401\n\t\tand lo_discount
between 4 and 6\n\t\tand lo_quantity between 26 and 35;","sequential_pipe",43);
X_7 := sql.mvc();
X_11:bat[:oid,:int] := sql.bind(X_7,"sys","lineorder","lo_quantity",0);
X_19:bat[:oid,:int] := sql.bind(X_7,"sys","lineorder","lo_discount",0);
- X_8:bat[:oid,:oid] := sql.tid(X_7,"sys","lineorder");
- X_91 := algebra.subselect(X_19,X_8,A1,A2,true,true,false);
- (X_21,r1_25) := sql.bind(X_7,"sys","lineorder","lo_discount",2);
- X_92 := algebra.subselect(r1_25,nil:bat[:oid,:oid],A1,A2,true,true,false);
+ C_8:bat[:oid,:oid] := sql.tid(X_7,"sys","lineorder");
+ C_83 := algebra.subselect(X_19,C_8,A1,A2,true,true,false);
+ (C_21,r1_25) := sql.bind(X_7,"sys","lineorder","lo_discount",2);
+ C_84 := algebra.subselect(r1_25,nil:bat[:oid,:oid],A1,A2,true,true,false);
X_23:bat[:oid,:int] := sql.bind(X_7,"sys","lineorder","lo_discount",1);
- X_94 := algebra.subselect(X_23,X_8,A1,A2,true,true,false);
- X_24 := sql.subdelta(X_91,X_8,X_21,X_92,X_94);
- X_95 := algebra.subselect(X_11,X_24,A3,A4,true,true,false);
- (X_14,r1_14) := sql.bind(X_7,"sys","lineorder","lo_quantity",2);
- X_96 := algebra.subselect(r1_14,nil:bat[:oid,:oid],A3,A4,true,true,false);
+ C_86 := algebra.subselect(X_23,C_8,A1,A2,true,true,false);
+ C_24 := sql.subdelta(C_83,C_8,C_21,C_84,C_86);
+ C_87 := algebra.subselect(X_11,C_24,A3,A4,true,true,false);
+ (C_14,r1_14) := sql.bind(X_7,"sys","lineorder","lo_quantity",2);
+ C_88 := algebra.subselect(r1_14,nil:bat[:oid,:oid],A3,A4,true,true,false);
X_17:bat[:oid,:int] := sql.bind(X_7,"sys","lineorder","lo_quantity",1);
- X_98 := algebra.subselect(X_17,X_24,A3,A4,true,true,false);
- X_26 := sql.subdelta(X_95,X_24,X_14,X_96,X_98);
+ C_89 := algebra.subselect(X_17,C_24,A3,A4,true,true,false);
+ C_26 := sql.subdelta(C_87,C_24,C_14,C_88,C_89);
X_27:bat[:oid,:oid] :=
sql.bind_idxbat(X_7,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_29,r1_37) :=
sql.bind_idxbat(X_7,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_31:bat[:oid,:oid] :=
sql.bind_idxbat(X_7,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
- X_32 := sql.projectdelta(X_26,X_27,X_29,r1_37,X_31);
- X_36:bat[:oid,:int] := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",0);
- X_33:bat[:oid,:oid] := sql.tid(X_7,"sys","dwdate");
- X_99 := algebra.subselect(X_36,X_33,A0,A0,true,false,false);
- (X_39,r1_49) := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",2);
- X_100 :=
algebra.subselect(r1_49,nil:bat[:oid,:oid],A0,A0,true,false,false);
- X_42:bat[:oid,:int] := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",1);
- X_102 := algebra.subselect(X_42,X_33,A0,A0,true,false,false);
- X_44 := sql.subdelta(X_99,X_33,X_39,X_100,X_102);
- X_46 := X_44;
- (X_47,r1_60) := algebra.subjoin(X_32,X_46,nil:BAT,nil:BAT,false,nil:lng);
- X_51:bat[:oid,:int] :=
sql.bind(X_7,"sys","lineorder","lo_extendedprice",0);
- (X_54,r1_67) := sql.bind(X_7,"sys","lineorder","lo_extendedprice",2);
- X_56:bat[:oid,:int] :=
sql.bind(X_7,"sys","lineorder","lo_extendedprice",1);
- X_57 := sql.projectdelta(X_26,X_51,X_54,r1_67,X_56);
- X_58 := algebra.leftfetchjoin(X_47,X_57);
- X_59 := batcalc.lng(X_58);
- X_60 := sql.projectdelta(X_26,X_19,X_21,r1_25,X_23);
- X_61 := algebra.leftfetchjoin(X_47,X_60);
- X_62:bat[:oid,:lng] := batcalc.*(X_59,X_61);
- X_63:lng := aggr.sum(X_62);
- sql.resultSet("sys.L1","revenue","bigint",64,0,7,X_63);
+ X_32 := sql.projectdelta(C_26,X_27,X_29,r1_37,X_31);
+ X_35:bat[:oid,:int] := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",0);
+ C_33:bat[:oid,:oid] := sql.tid(X_7,"sys","dwdate");
+ C_90 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
+ (C_37,r1_47) := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",2);
+ C_91 := algebra.subselect(r1_47,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ X_39:bat[:oid,:int] := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",1);
+ C_92 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
+ C_40 := sql.subdelta(C_90,C_33,C_37,C_91,C_92);
+ (X_41,r1_56) := algebra.subjoin(X_32,C_40,nil:BAT,nil:BAT,false,nil:lng);
+ X_45:bat[:oid,:int] :=
sql.bind(X_7,"sys","lineorder","lo_extendedprice",0);
+ (C_47,r1_63) := sql.bind(X_7,"sys","lineorder","lo_extendedprice",2);
+ X_49:bat[:oid,:int] :=
sql.bind(X_7,"sys","lineorder","lo_extendedprice",1);
+ X_50 := sql.projectdelta(C_26,X_45,C_47,r1_63,X_49);
+ X_51 := algebra.leftfetchjoin(X_41,X_50);
+ X_52 := batcalc.lng(X_51);
+ X_53 := sql.projectdelta(C_26,X_19,C_21,r1_25,X_23);
+ X_54 := algebra.leftfetchjoin(X_41,X_53);
+ X_55:bat[:oid,:lng] := batcalc.*(X_52,X_54);
+ X_56:lng := aggr.sum(X_55);
+ sql.resultSet("sys.L1","revenue","bigint",64,0,7,X_56);
end user.s2_1;
# 23:10:45 >
diff --git a/sql/benchmarks/ssbm/Tests/03-explain.stable.out
b/sql/benchmarks/ssbm/Tests/03-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/03-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/03-explain.stable.out
@@ -38,55 +38,54 @@ Ready.
% clob # type
% 302 # length
function
user.s2_1{autoCommit=true}(A0:int,A1:int,A2:int,A3:int,A4:int,A5:int):void;
- X_79:void := querylog.define("explain\nselect
sum(lo_extendedprice*lo_discount) as revenue\n\tfrom lineorder, dwdate\n\twhere
lo_orderdate = d_datekey\n\t\tand d_weeknuminyear = 6 and d_year =
1994\n\t\tand lo_discount between 5 and 7\n\t\tand lo_quantity between 36 and
40;","sequential_pipe",50);
+ X_70:void := querylog.define("explain\nselect
sum(lo_extendedprice*lo_discount) as revenue\n\tfrom lineorder, dwdate\n\twhere
lo_orderdate = d_datekey\n\t\tand d_weeknuminyear = 6 and d_year =
1994\n\t\tand lo_discount between 5 and 7\n\t\tand lo_quantity between 36 and
40;","sequential_pipe",50);
X_8 := sql.mvc();
X_12:bat[:oid,:int] := sql.bind(X_8,"sys","lineorder","lo_quantity",0);
X_20:bat[:oid,:int] := sql.bind(X_8,"sys","lineorder","lo_discount",0);
- X_9:bat[:oid,:oid] := sql.tid(X_8,"sys","lineorder");
- X_100 := algebra.subselect(X_20,X_9,A2,A3,true,true,false);
- (X_22,r1_26) := sql.bind(X_8,"sys","lineorder","lo_discount",2);
- X_101 := algebra.subselect(r1_26,nil:bat[:oid,:oid],A2,A3,true,true,false);
+ C_9:bat[:oid,:oid] := sql.tid(X_8,"sys","lineorder");
+ C_92 := algebra.subselect(X_20,C_9,A2,A3,true,true,false);
+ (C_22,r1_26) := sql.bind(X_8,"sys","lineorder","lo_discount",2);
+ C_93 := algebra.subselect(r1_26,nil:bat[:oid,:oid],A2,A3,true,true,false);
X_24:bat[:oid,:int] := sql.bind(X_8,"sys","lineorder","lo_discount",1);
- X_103 := algebra.subselect(X_24,X_9,A2,A3,true,true,false);
- X_25 := sql.subdelta(X_100,X_9,X_22,X_101,X_103);
- X_104 := algebra.subselect(X_12,X_25,A4,A5,true,true,false);
- (X_15,r1_15) := sql.bind(X_8,"sys","lineorder","lo_quantity",2);
- X_105 := algebra.subselect(r1_15,nil:bat[:oid,:oid],A4,A5,true,true,false);
+ C_95 := algebra.subselect(X_24,C_9,A2,A3,true,true,false);
+ C_25 := sql.subdelta(C_92,C_9,C_22,C_93,C_95);
+ C_96 := algebra.subselect(X_12,C_25,A4,A5,true,true,false);
+ (C_15,r1_15) := sql.bind(X_8,"sys","lineorder","lo_quantity",2);
+ C_97 := algebra.subselect(r1_15,nil:bat[:oid,:oid],A4,A5,true,true,false);
X_18:bat[:oid,:int] := sql.bind(X_8,"sys","lineorder","lo_quantity",1);
- X_107 := algebra.subselect(X_18,X_25,A4,A5,true,true,false);
- X_27 := sql.subdelta(X_104,X_25,X_15,X_105,X_107);
+ C_98 := algebra.subselect(X_18,C_25,A4,A5,true,true,false);
+ C_27 := sql.subdelta(C_96,C_25,C_15,C_97,C_98);
X_28:bat[:oid,:oid] :=
sql.bind_idxbat(X_8,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_30,r1_38) :=
sql.bind_idxbat(X_8,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_32:bat[:oid,:oid] :=
sql.bind_idxbat(X_8,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
- X_33 := sql.projectdelta(X_27,X_28,X_30,r1_38,X_32);
- X_37:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",0);
- X_45:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_year",0);
- X_34:bat[:oid,:oid] := sql.tid(X_8,"sys","dwdate");
- X_109 := algebra.subselect(X_45,X_34,A1,A1,true,false,false);
- (X_47,r1_60) := sql.bind(X_8,"sys","dwdate","d_year",2);
- X_110 :=
algebra.subselect(r1_60,nil:bat[:oid,:oid],A1,A1,true,false,false);
- X_49:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_year",1);
- X_112 := algebra.subselect(X_49,X_34,A1,A1,true,false,false);
- X_50 := sql.subdelta(X_109,X_34,X_47,X_110,X_112);
- X_113 := algebra.subselect(X_37,X_50,A0,A0,true,false,false);
- (X_40,r1_50) := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",2);
- X_114 :=
algebra.subselect(r1_50,nil:bat[:oid,:oid],A0,A0,true,false,false);
- X_43:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",1);
- X_116 := algebra.subselect(X_43,X_50,A0,A0,true,false,false);
- X_53 := sql.subdelta(X_113,X_50,X_40,X_114,X_116);
- X_54 := X_53;
- (X_55,r1_71) := algebra.subjoin(X_33,X_54,nil:BAT,nil:BAT,false,nil:lng);
- X_59:bat[:oid,:int] :=
sql.bind(X_8,"sys","lineorder","lo_extendedprice",0);
- (X_62,r1_78) := sql.bind(X_8,"sys","lineorder","lo_extendedprice",2);
- X_65:bat[:oid,:int] :=
sql.bind(X_8,"sys","lineorder","lo_extendedprice",1);
- X_66 := sql.projectdelta(X_27,X_59,X_62,r1_78,X_65);
- X_67 := algebra.leftfetchjoin(X_55,X_66);
- X_68 := batcalc.lng(X_67);
- X_69 := sql.projectdelta(X_27,X_20,X_22,r1_26,X_24);
- X_70 := algebra.leftfetchjoin(X_55,X_69);
- X_71:bat[:oid,:lng] := batcalc.*(X_68,X_70);
- X_72:lng := aggr.sum(X_71);
- sql.resultSet("sys.L1","revenue","bigint",64,0,7,X_72);
+ X_33 := sql.projectdelta(C_27,X_28,X_30,r1_38,X_32);
+ X_36:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",0);
+ X_41:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_year",0);
+ C_34:bat[:oid,:oid] := sql.tid(X_8,"sys","dwdate");
+ C_99 := algebra.subselect(X_41,C_34,A1,A1,true,false,false);
+ (C_43,r1_56) := sql.bind(X_8,"sys","dwdate","d_year",2);
+ C_100 :=
algebra.subselect(r1_56,nil:bat[:oid,:oid],A1,A1,true,false,false);
+ X_45:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_year",1);
+ C_101 := algebra.subselect(X_45,C_34,A1,A1,true,false,false);
+ C_46 := sql.subdelta(C_99,C_34,C_43,C_100,C_101);
+ C_102 := algebra.subselect(X_36,C_46,A0,A0,true,false,false);
+ (C_38,r1_48) := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",2);
+ C_103 :=
algebra.subselect(r1_48,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ X_40:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",1);
+ C_104 := algebra.subselect(X_40,C_46,A0,A0,true,false,false);
+ C_47 := sql.subdelta(C_102,C_46,C_38,C_103,C_104);
+ (X_48,r1_66) := algebra.subjoin(X_33,C_47,nil:BAT,nil:BAT,false,nil:lng);
+ X_52:bat[:oid,:int] :=
sql.bind(X_8,"sys","lineorder","lo_extendedprice",0);
+ (C_54,r1_74) := sql.bind(X_8,"sys","lineorder","lo_extendedprice",2);
+ X_56:bat[:oid,:int] :=
sql.bind(X_8,"sys","lineorder","lo_extendedprice",1);
+ X_57 := sql.projectdelta(C_27,X_52,C_54,r1_74,X_56);
+ X_58 := algebra.leftfetchjoin(X_48,X_57);
+ X_59 := batcalc.lng(X_58);
+ X_60 := sql.projectdelta(C_27,X_20,C_22,r1_26,X_24);
+ X_61 := algebra.leftfetchjoin(X_48,X_60);
+ X_62:bat[:oid,:lng] := batcalc.*(X_59,X_61);
+ X_63:lng := aggr.sum(X_62);
+ sql.resultSet("sys.L1","revenue","bigint",64,0,7,X_63);
end user.s2_1;
# 23:10:45 >
diff --git a/sql/benchmarks/ssbm/Tests/04-explain.stable.out
b/sql/benchmarks/ssbm/Tests/04-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/04-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/04-explain.stable.out
@@ -41,91 +41,89 @@ Ready.
% clob # type
% 412 # length
function user.s2_1{autoCommit=true}(A0:str,A1:str):void;
- X_156:void := querylog.define("explain\nselect sum(lo_revenue), d_year,
p_brand1\n\tfrom lineorder, dwdate, part, supplier\n\twhere lo_orderdate =
d_datekey\n\t\tand lo_partkey = p_partkey\n\t\tand lo_suppkey =
s_suppkey\n\t\tand p_category = \\'MFGR#12\\' -- OK to add p_mfgr =
’MFGR#1’\n\t\tand s_region = \\'AMERICA\\'\n\tgroup by d_year,
p_brand1\n\torder by d_year, p_brand1;","sequential_pipe",87);
- X_121 := bat.new(nil:oid,nil:str);
- X_129 := bat.append(X_121,"sys.L1");
- X_139 := bat.append(X_129,"sys.dwdate");
- X_148 := bat.append(X_139,"sys.part");
- X_124 := bat.new(nil:oid,nil:str);
- X_131 := bat.append(X_124,"L1");
- X_141 := bat.append(X_131,"d_year");
- X_150 := bat.append(X_141,"p_brand1");
- X_125 := bat.new(nil:oid,nil:str);
- X_133 := bat.append(X_125,"bigint");
- X_143 := bat.append(X_133,"int");
- X_152 := bat.append(X_143,"clob");
- X_126 := bat.new(nil:oid,nil:int);
- X_135 := bat.append(X_126,64);
- X_145 := bat.append(X_135,32);
- X_154 := bat.append(X_145,0);
- X_128 := bat.new(nil:oid,nil:int);
- X_137 := bat.append(X_128,0);
- X_147 := bat.append(X_137,0);
- X_155 := bat.append(X_147,0);
+ X_130:void := querylog.define("explain\nselect sum(lo_revenue), d_year,
p_brand1\n\tfrom lineorder, dwdate, part, supplier\n\twhere lo_orderdate =
d_datekey\n\t\tand lo_partkey = p_partkey\n\t\tand lo_suppkey =
s_suppkey\n\t\tand p_category = \\'MFGR#12\\' -- OK to add p_mfgr =
’MFGR#1’\n\t\tand s_region = \\'AMERICA\\'\n\tgroup by d_year,
p_brand1\n\torder by d_year, p_brand1;","sequential_pipe",85);
+ X_98 := bat.new(nil:oid,nil:str);
+ X_106 := bat.append(X_98,"sys.L1");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
