Changeset: df25227185af for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=df25227185af
Modified Files:
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
Branch: default
Log Message:
approved output
diffs (87 lines):
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
@@ -43,32 +43,32 @@ function user.s2_1{autoCommit=true}(A0:d
X_67: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",40);
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_83 := 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_84 :=
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_86 := algebra.subselect(X_38,X_11,A0,X_39,true,false,false);
- X_40 := sql.subdelta(X_83,X_11,X_34,X_84,X_86);
- X_87 := algebra.thetasubselect(X_27,X_40,A7,"<");
- (X_29,r1_35) := sql.bind(X_10,"sys","lineitem","l_quantity",2);
- X_88 := algebra.thetasubselect(r1_35,nil:bat[:oid,:oid],A7,"<");
- X_31:bat[:oid,:int] := sql.bind(X_10,"sys","lineitem","l_quantity",1);
- X_90 := algebra.thetasubselect(X_31,X_40,A7,"<");
- X_43 := sql.subdelta(X_87,X_40,X_29,X_88,X_90);
+ X_83 := algebra.thetasubselect(X_33,X_11,A7,"<");
+ (X_37,r1_48) := sql.bind(X_10,"sys","lineitem","l_quantity",2);
+ X_84 := algebra.thetasubselect(r1_48,nil:bat[:oid,:oid],A7,"<");
+ X_39:bat[:oid,:int] := sql.bind(X_10,"sys","lineitem","l_quantity",1);
+ X_86 := algebra.thetasubselect(X_39,X_11,A7,"<");
+ X_40 := sql.subdelta(X_83,X_11,X_37,X_84,X_86);
+ X_32 := mtime.addmonths(A1,A2);
+ X_87 := 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_88 :=
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_90 := algebra.subselect(X_31,X_40,A0,X_32,true,false,false);
+ X_42 := sql.subdelta(X_87,X_40,X_29,X_88,X_90);
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_91 := algebra.subselect(X_14,X_43,X_23,X_26,true,true,false);
+ X_91 := 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_92 :=
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_94 := algebra.subselect(X_20,X_43,X_23,X_26,true,true,false);
- X_45 := sql.subdelta(X_91,X_43,X_17,X_92,X_94);
+ X_94 := algebra.subselect(X_20,X_42,X_23,X_26,true,true,false);
+ X_45 := sql.subdelta(X_91,X_42,X_17,X_92,X_94);
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);
@@ -77,7 +77,7 @@ function user.s2_1{autoCommit=true}(A0:d
X_57 := sql.projectdelta(X_45,X_14,X_17,r1_17,X_20);
X_58:bat[:oid,:hge] := batcalc.*(X_55,X_57);
X_59:hge := aggr.sum(X_58);
- sql.exportValue(1,"sys.L1","revenue","decimal",30,4,9,X_59,"");
+ sql.exportValue(1,"sys.L1","revenue","decimal",30,4,10,X_59,"");
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
@@ -93,7 +93,7 @@ function user.s2_1{autoCommit=true}(A0:s
X_84:hge := aggr.sum(X_83);
X_85 := calc./(X_77,X_84);
X_86 := calc.*(A0,X_85);
- sql.exportValue(1,".L2","promo_revenue","decimal",39,2,9,X_86,"");
+ sql.exportValue(1,".L2","promo_revenue","decimal",39,2,10,X_86,"");
end user.s2_1;
# 22:53:29 >
diff --git a/sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
b/sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
@@ -219,7 +219,7 @@ function user.s2_1{autoCommit=true}(A0:b
X_264:bat[:oid,:lng] := batcalc.-(X_255,X_263);
X_265:bat[:oid,:hge] := batcalc.*(X_253,X_264);
X_266:hge := aggr.sum(X_265);
- sql.exportValue(1,"sys.L1","revenue","decimal",33,4,9,X_266,"");
+ sql.exportValue(1,"sys.L1","revenue","decimal",33,4,10,X_266,"");
end user.s2_1;
# 22:53:30 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
