Changeset: bae89ed7d1b1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bae89ed7d1b1
Modified Files:
sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
Branch: resultset
Log Message:
approved output
diffs (truncated from 473 to 300 lines):
diff --git a/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
b/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
@@ -38,35 +38,35 @@ Ready.
% clob # type
% 265 # length
function user.s2_1{autoCommit=true}(A0:int,A1:int,A2:int,A3:int):void;
- 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_year = 1993\n\t\tand lo_discount between 1
and 3\n\t\tand lo_quantity < 25;","sequential_pipe",44);
+ 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_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_90 := algebra.subselect(X_18,X_7,A1,A2,true,true,false);
+ 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_91 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A1,A2,true,true,false);
+ X_92 := 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_93 := algebra.subselect(X_22,X_7,A1,A2,true,true,false);
- X_23 := sql.subdelta(X_90,X_7,X_20,X_91,X_93);
- X_94 := algebra.thetasubselect(X_10,X_23,A3,"<");
+ 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_95 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
+ X_96 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
X_16:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",1);
- X_97 := algebra.thetasubselect(X_16,X_23,A3,"<");
- X_25 := sql.subdelta(X_94,X_23,X_13,X_95,X_97);
+ X_98 := algebra.thetasubselect(X_16,X_23,A3,"<");
+ X_25 := sql.subdelta(X_95,X_23,X_13,X_96,X_98);
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_98 := algebra.subselect(X_36,X_33,A0,A0,true,true,false);
+ X_99 := algebra.subselect(X_36,X_33,A0,A0,true,true,false);
(X_39,r1_48) := sql.bind(X_6,"sys","dwdate","d_year",2);
- X_99 := algebra.subselect(r1_48,nil:bat[:oid,:oid],A0,A0,true,true,false);
+ X_100 := algebra.subselect(r1_48,nil:bat[:oid,:oid],A0,A0,true,true,false);
X_42:bat[:oid,:int] := sql.bind(X_6,"sys","dwdate","d_year",1);
- X_101 := algebra.subselect(X_42,X_33,A0,A0,true,true,false);
- X_44 := sql.subdelta(X_98,X_33,X_39,X_99,X_101);
+ X_102 := algebra.subselect(X_42,X_33,A0,A0,true,true,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);
@@ -79,7 +79,7 @@ function user.s2_1{autoCommit=true}(A0:i
X_61 := algebra.leftfetchjoin(X_47,X_60);
X_62:bat[:oid,:lng] := batcalc.*(X_59,X_61);
X_63:hge := aggr.sum(X_62);
- sql.resultSet("sys.L1","revenue","hugeint",128,0,X_63);
+ sql.resultSet("sys.L1","revenue","hugeint",128,0,7,X_63);
end user.s2_1;
# 23:10:45 >
diff --git a/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
b/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
@@ -38,35 +38,35 @@ Ready.
% clob # type
% 288 # length
function user.s2_1{autoCommit=true}(A0:int,A1:int,A2:int,A3:int,A4:int):void;
- 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_yearmonthnum = 199401\n\t\tand lo_discount
between 4 and 6\n\t\tand lo_quantity between 26 and 35;","sequential_pipe",44);
+ 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_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_90 := algebra.subselect(X_19,X_8,A1,A2,true,true,false);
+ 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_91 := algebra.subselect(r1_25,nil:bat[:oid,:oid],A1,A2,true,true,false);
+ X_92 := 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_93 := algebra.subselect(X_23,X_8,A1,A2,true,true,false);
- X_24 := sql.subdelta(X_90,X_8,X_21,X_91,X_93);
- X_94 := algebra.subselect(X_11,X_24,A3,A4,true,true,false);
+ 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_95 := algebra.subselect(r1_14,nil:bat[:oid,:oid],A3,A4,true,true,false);
+ X_96 := 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_97 := algebra.subselect(X_17,X_24,A3,A4,true,true,false);
- X_26 := sql.subdelta(X_94,X_24,X_14,X_95,X_97);
+ 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);
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_98 := algebra.subselect(X_36,X_33,A0,A0,true,true,false);
+ X_99 := algebra.subselect(X_36,X_33,A0,A0,true,true,false);
(X_39,r1_49) := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",2);
- X_99 := algebra.subselect(r1_49,nil:bat[:oid,:oid],A0,A0,true,true,false);
+ X_100 := algebra.subselect(r1_49,nil:bat[:oid,:oid],A0,A0,true,true,false);
X_42:bat[:oid,:int] := sql.bind(X_7,"sys","dwdate","d_yearmonthnum",1);
- X_101 := algebra.subselect(X_42,X_33,A0,A0,true,true,false);
- X_44 := sql.subdelta(X_98,X_33,X_39,X_99,X_101);
+ X_102 := algebra.subselect(X_42,X_33,A0,A0,true,true,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);
@@ -79,7 +79,7 @@ function user.s2_1{autoCommit=true}(A0:i
X_61 := algebra.leftfetchjoin(X_47,X_60);
X_62:bat[:oid,:lng] := batcalc.*(X_59,X_61);
X_63:hge := aggr.sum(X_62);
- sql.resultSet("sys.L1","revenue","hugeint",128,0,X_63);
+ sql.resultSet("sys.L1","revenue","hugeint",128,0,7,X_63);
end user.s2_1;
# 23:10:45 >
diff --git a/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
b/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
@@ -38,23 +38,23 @@ 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",51);
+ X_80: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",51);
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_101 := 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);
+ X_102 := 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_104 := algebra.subselect(X_24,X_9,A2,A3,true,true,false);
+ X_25 := sql.subdelta(X_101,X_9,X_22,X_102,X_104);
+ X_105 := 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);
+ X_106 := 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);
+ X_108 := algebra.subselect(X_18,X_25,A4,A5,true,true,false);
+ X_27 := sql.subdelta(X_105,X_25,X_15,X_106,X_108);
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);
@@ -62,18 +62,18 @@ function user.s2_1{autoCommit=true}(A0:i
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_108 := algebra.subselect(X_45,X_34,A1,A1,true,true,false);
+ X_109 := algebra.subselect(X_45,X_34,A1,A1,true,true,false);
(X_47,r1_60) := sql.bind(X_8,"sys","dwdate","d_year",2);
- X_109 := algebra.subselect(r1_60,nil:bat[:oid,:oid],A1,A1,true,true,false);
+ X_110 := algebra.subselect(r1_60,nil:bat[:oid,:oid],A1,A1,true,true,false);
X_49:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_year",1);
- X_111 := algebra.subselect(X_49,X_34,A1,A1,true,true,false);
- X_50 := sql.subdelta(X_108,X_34,X_47,X_109,X_111);
- X_112 := algebra.subselect(X_37,X_50,A0,A0,true,true,false);
+ X_112 := algebra.subselect(X_49,X_34,A1,A1,true,true,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,true,false);
(X_40,r1_50) := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",2);
- X_113 := algebra.subselect(r1_50,nil:bat[:oid,:oid],A0,A0,true,true,false);
+ X_114 := algebra.subselect(r1_50,nil:bat[:oid,:oid],A0,A0,true,true,false);
X_43:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",1);
- X_115 := algebra.subselect(X_43,X_50,A0,A0,true,true,false);
- X_53 := sql.subdelta(X_112,X_50,X_40,X_113,X_115);
+ X_116 := algebra.subselect(X_43,X_50,A0,A0,true,true,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);
@@ -86,7 +86,7 @@ function user.s2_1{autoCommit=true}(A0:i
X_70 := algebra.leftfetchjoin(X_55,X_69);
X_71:bat[:oid,:lng] := batcalc.*(X_68,X_70);
X_72:hge := aggr.sum(X_71);
- sql.resultSet("sys.L1","revenue","hugeint",128,0,X_72);
+ sql.resultSet("sys.L1","revenue","hugeint",128,0,7,X_72);
end user.s2_1;
# 23:10:45 >
diff --git a/sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
b/sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
@@ -40,35 +40,35 @@ Ready.
% clob # type
% 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_64: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_65: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,: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_80 := algebra.thetasubselect(X_33,X_11,A7,"<");
+ X_81 := algebra.thetasubselect(X_33,X_11,A7,"<");
(X_37,r1_48) := sql.bind(X_10,"sys","lineitem","l_quantity",2);
- X_81 := algebra.thetasubselect(r1_48,nil:bat[:oid,:oid],A7,"<");
+ X_82 := algebra.thetasubselect(r1_48,nil:bat[:oid,:oid],A7,"<");
X_39:bat[:oid,:int] := sql.bind(X_10,"sys","lineitem","l_quantity",1);
- X_83 := algebra.thetasubselect(X_39,X_11,A7,"<");
- X_40 := sql.subdelta(X_80,X_11,X_37,X_81,X_83);
+ X_84 := algebra.thetasubselect(X_39,X_11,A7,"<");
+ X_40 := sql.subdelta(X_81,X_11,X_37,X_82,X_84);
X_32 := mtime.addmonths(A1,A2);
- X_84 := algebra.subselect(X_27,X_40,A0,X_32,true,false,false);
+ X_85 := 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_85 :=
algebra.subselect(r1_35,nil:bat[:oid,:oid],A0,X_32,true,false,false);
+ X_86 :=
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_87 := algebra.subselect(X_31,X_40,A0,X_32,true,false,false);
- X_42 := sql.subdelta(X_84,X_40,X_29,X_85,X_87);
+ X_88 := algebra.subselect(X_31,X_40,A0,X_32,true,false,false);
+ X_42 := sql.subdelta(X_85,X_40,X_29,X_86,X_88);
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_88 := algebra.subselect(X_14,X_42,X_23,X_26,true,true,false);
+ X_89 := 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_89 :=
algebra.subselect(r1_17,nil:bat[:oid,:oid],X_23,X_26,true,true,false);
+ X_90 :=
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_91 := algebra.subselect(X_20,X_42,X_23,X_26,true,true,false);
- X_45 := sql.subdelta(X_88,X_42,X_17,X_89,X_91);
+ X_92 := algebra.subselect(X_20,X_42,X_23,X_26,true,true,false);
+ X_45 := sql.subdelta(X_89,X_42,X_17,X_90,X_92);
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_56 := sql.projectdelta(X_45,X_14,X_17,r1_17,X_20);
X_57:bat[:oid,:hge] := batcalc.*(X_54,X_56);
X_58:hge := aggr.sum(X_57);
- sql.resultSet("sys.L1","revenue","decimal",30,4,X_58);
+ sql.resultSet("sys.L1","revenue","decimal",30,4,10,X_58);
end user.s2_1;
# 22:53:26 >
diff --git a/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
b/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
@@ -44,17 +44,17 @@ Ready.
% clob # type
% 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_91: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_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");
X_22 := mtime.addmonths(A6,A7);
- X_111 := algebra.subselect(X_14,X_11,A5,X_22,true,false,false);
+ X_112 := algebra.subselect(X_14,X_11,A5,X_22,true,false,false);
(X_17,r1_18) := sql.bind(X_10,"sys","lineitem","l_shipdate",2);
- X_112 :=
algebra.subselect(r1_18,nil:bat[:oid,:oid],A5,X_22,true,false,false);
+ X_113 :=
algebra.subselect(r1_18,nil:bat[:oid,:oid],A5,X_22,true,false,false);
X_20:bat[:oid,:date] := sql.bind(X_10,"sys","lineitem","l_shipdate",1);
- X_114 := algebra.subselect(X_20,X_11,A5,X_22,true,false,false);
- X_23 := sql.subdelta(X_111,X_11,X_17,X_112,X_114);
+ X_115 := algebra.subselect(X_20,X_11,A5,X_22,true,false,false);
+ X_23 := sql.subdelta(X_112,X_11,X_17,X_113,X_115);
X_25:bat[:oid,:oid] :=
sql.bind_idxbat(X_10,"sys","lineitem","lineitem_l_partkey_fkey",0);
(X_27,r1_33) :=
sql.bind_idxbat(X_10,"sys","lineitem","lineitem_l_partkey_fkey",2);
X_29:bat[:oid,:oid] :=
sql.bind_idxbat(X_10,"sys","lineitem","lineitem_l_partkey_fkey",1);
@@ -92,7 +92,7 @@ function user.s2_1{autoCommit=true}(A0:s
X_83:hge := aggr.sum(X_82);
X_84 := calc./(X_76,X_83);
X_85 := calc.*(A0,X_84);
- sql.resultSet(".L2","promo_revenue","decimal",39,2,X_85);
+ sql.resultSet(".L2","promo_revenue","decimal",39,2,10,X_85);
end user.s2_1;
# 22:53:29 >
diff --git a/sql/benchmarks/tpch/Tests/17-explain.stable.out
b/sql/benchmarks/tpch/Tests/17-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/17-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/17-explain.stable.out
@@ -62,18 +62,18 @@ function user.s2_1{autoCommit=true}(A0:b
X_27:bat[:oid,:str] := sql.bind(X_6,"sys","part","p_container",0);
X_32:bat[:oid,:str] := sql.bind(X_6,"sys","part","p_brand",0);
X_25:bat[:oid,:oid] := sql.tid(X_6,"sys","part");
- X_139 := algebra.subselect(X_32,X_25,A1,A1,true,true,false);
+ X_140 := algebra.subselect(X_32,X_25,A1,A1,true,true,false);
(X_34,r1_40) := sql.bind(X_6,"sys","part","p_brand",2);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
