Changeset: e54b1faa2fa0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e54b1faa2fa0
Modified Files:
sql/benchmarks/ssbm/Tests/01-explain.stable.out
sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/06-explain.stable.out
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/12-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
Branch: default
Log Message:
Approve output
diffs (truncated from 1842 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
@@ -43,30 +43,30 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_9:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_quantity",0);
X_17:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_discount",0);
C_6:bat[:oid] := sql.tid(X_5,"sys","lineorder");
- C_72 := algebra.subselect(X_17,C_6,A1,A2,true,true,false);
+ C_79 := algebra.subselect(X_17,C_6,A1,A2,true,true,false);
(C_19,r1_22) := sql.bind(X_5,"sys","lineorder","lo_discount",2);
- C_73 := algebra.subselect(r1_22,nil:bat[:oid],A1,A2,true,true,false);
+ C_80 := algebra.subselect(r1_22,nil:bat[:oid],A1,A2,true,true,false);
X_21:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_discount",1);
- C_75 := algebra.subselect(X_21,C_6,A1,A2,true,true,false);
- C_22 := sql.subdelta(C_72,C_6,C_19,C_73,C_75);
- C_76 := algebra.thetasubselect(X_9,C_22,A3,"<");
+ C_82 := algebra.subselect(X_21,C_6,A1,A2,true,true,false);
+ C_22 := sql.subdelta(C_79,C_6,C_19,C_80,C_82);
+ C_83 := algebra.thetasubselect(X_9,C_22,A3,"<");
(C_12,r1_12) := sql.bind(X_5,"sys","lineorder","lo_quantity",2);
- C_77 := algebra.thetasubselect(r1_12,nil:bat[:oid],A3,"<");
+ C_84 := algebra.thetasubselect(r1_12,nil:bat[:oid],A3,"<");
X_15:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_quantity",1);
- C_78 := algebra.thetasubselect(X_15,C_22,A3,"<");
- C_25 := sql.subdelta(C_76,C_22,C_12,C_77,C_78);
+ C_85 := algebra.thetasubselect(X_15,C_22,A3,"<");
+ C_25 := sql.subdelta(C_83,C_22,C_12,C_84,C_85);
X_27:bat[:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_29,r1_37) :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_31:bat[:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_32 := sql.projectdelta(C_25,X_27,X_29,r1_37,X_31);
X_35:bat[:int] := sql.bind(X_5,"sys","dwdate","d_year",0);
C_33:bat[:oid] := sql.tid(X_5,"sys","dwdate");
- C_79 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
+ C_86 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
(C_37,r1_47) := sql.bind(X_5,"sys","dwdate","d_year",2);
- C_80 := algebra.subselect(r1_47,nil:bat[:oid],A0,A0,true,false,false);
+ C_87 := algebra.subselect(r1_47,nil:bat[:oid],A0,A0,true,false,false);
X_39:bat[:int] := sql.bind(X_5,"sys","dwdate","d_year",1);
- C_81 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
- C_40 := sql.subdelta(C_79,C_33,C_37,C_80,C_81);
+ C_88 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
+ C_40 := sql.subdelta(C_86,C_33,C_37,C_87,C_88);
(X_41,r1_55) := algebra.subjoin(X_32,C_40,nil:BAT,nil:BAT,false,nil:lng);
X_45:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_extendedprice",0);
(C_47,r1_62) := sql.bind(X_5,"sys","lineorder","lo_extendedprice",2);
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
@@ -43,30 +43,30 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_9:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_quantity",0);
X_17:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_discount",0);
C_6:bat[:oid] := sql.tid(X_5,"sys","lineorder");
- C_72 := algebra.subselect(X_17,C_6,A1,A2,true,true,false);
+ C_79 := algebra.subselect(X_17,C_6,A1,A2,true,true,false);
(C_19,r1_22) := sql.bind(X_5,"sys","lineorder","lo_discount",2);
- C_73 := algebra.subselect(r1_22,nil:bat[:oid],A1,A2,true,true,false);
+ C_80 := algebra.subselect(r1_22,nil:bat[:oid],A1,A2,true,true,false);
X_21:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_discount",1);
- C_75 := algebra.subselect(X_21,C_6,A1,A2,true,true,false);
- C_22 := sql.subdelta(C_72,C_6,C_19,C_73,C_75);
- C_76 := algebra.thetasubselect(X_9,C_22,A3,"<");
+ C_82 := algebra.subselect(X_21,C_6,A1,A2,true,true,false);
+ C_22 := sql.subdelta(C_79,C_6,C_19,C_80,C_82);
+ C_83 := algebra.thetasubselect(X_9,C_22,A3,"<");
(C_12,r1_12) := sql.bind(X_5,"sys","lineorder","lo_quantity",2);
- C_77 := algebra.thetasubselect(r1_12,nil:bat[:oid],A3,"<");
+ C_84 := algebra.thetasubselect(r1_12,nil:bat[:oid],A3,"<");
X_15:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_quantity",1);
- C_78 := algebra.thetasubselect(X_15,C_22,A3,"<");
- C_25 := sql.subdelta(C_76,C_22,C_12,C_77,C_78);
+ C_85 := algebra.thetasubselect(X_15,C_22,A3,"<");
+ C_25 := sql.subdelta(C_83,C_22,C_12,C_84,C_85);
X_27:bat[:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_29,r1_37) :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_31:bat[:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_32 := sql.projectdelta(C_25,X_27,X_29,r1_37,X_31);
X_35:bat[:int] := sql.bind(X_5,"sys","dwdate","d_year",0);
C_33:bat[:oid] := sql.tid(X_5,"sys","dwdate");
- C_79 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
+ C_86 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
(C_37,r1_47) := sql.bind(X_5,"sys","dwdate","d_year",2);
- C_80 := algebra.subselect(r1_47,nil:bat[:oid],A0,A0,true,false,false);
+ C_87 := algebra.subselect(r1_47,nil:bat[:oid],A0,A0,true,false,false);
X_39:bat[:int] := sql.bind(X_5,"sys","dwdate","d_year",1);
- C_81 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
- C_40 := sql.subdelta(C_79,C_33,C_37,C_80,C_81);
+ C_88 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
+ C_40 := sql.subdelta(C_86,C_33,C_37,C_87,C_88);
(X_41,r1_55) := algebra.subjoin(X_32,C_40,nil:BAT,nil:BAT,false,nil:lng);
X_45:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_extendedprice",0);
(C_47,r1_62) := sql.bind(X_5,"sys","lineorder","lo_extendedprice",2);
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
@@ -43,30 +43,30 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_10:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",0);
X_18:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_discount",0);
C_7:bat[:oid] := sql.tid(X_6,"sys","lineorder");
- C_72 := algebra.subselect(X_18,C_7,A1,A2,true,true,false);
+ C_79 := algebra.subselect(X_18,C_7,A1,A2,true,true,false);
(C_20,r1_24) := sql.bind(X_6,"sys","lineorder","lo_discount",2);
- C_73 := algebra.subselect(r1_24,nil:bat[:oid],A1,A2,true,true,false);
+ C_80 := algebra.subselect(r1_24,nil:bat[:oid],A1,A2,true,true,false);
X_22:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_discount",1);
- C_75 := algebra.subselect(X_22,C_7,A1,A2,true,true,false);
- C_23 := sql.subdelta(C_72,C_7,C_20,C_73,C_75);
- C_76 := algebra.subselect(X_10,C_23,A3,A4,true,true,false);
+ C_82 := algebra.subselect(X_22,C_7,A1,A2,true,true,false);
+ C_23 := sql.subdelta(C_79,C_7,C_20,C_80,C_82);
+ C_83 := algebra.subselect(X_10,C_23,A3,A4,true,true,false);
(C_13,r1_13) := sql.bind(X_6,"sys","lineorder","lo_quantity",2);
- C_77 := algebra.subselect(r1_13,nil:bat[:oid],A3,A4,true,true,false);
+ C_84 := algebra.subselect(r1_13,nil:bat[:oid],A3,A4,true,true,false);
X_16:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",1);
- C_78 := algebra.subselect(X_16,C_23,A3,A4,true,true,false);
- C_26 := sql.subdelta(C_76,C_23,C_13,C_77,C_78);
+ C_85 := algebra.subselect(X_16,C_23,A3,A4,true,true,false);
+ C_26 := sql.subdelta(C_83,C_23,C_13,C_84,C_85);
X_27:bat[:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_29,r1_38) :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_31:bat[:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_32 := sql.projectdelta(C_26,X_27,X_29,r1_38,X_31);
X_35:bat[:int] := sql.bind(X_6,"sys","dwdate","d_yearmonthnum",0);
C_33:bat[:oid] := sql.tid(X_6,"sys","dwdate");
- C_79 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
+ C_86 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
(C_37,r1_48) := sql.bind(X_6,"sys","dwdate","d_yearmonthnum",2);
- C_80 := algebra.subselect(r1_48,nil:bat[:oid],A0,A0,true,false,false);
+ C_87 := algebra.subselect(r1_48,nil:bat[:oid],A0,A0,true,false,false);
X_39:bat[:int] := sql.bind(X_6,"sys","dwdate","d_yearmonthnum",1);
- C_81 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
- C_40 := sql.subdelta(C_79,C_33,C_37,C_80,C_81);
+ C_88 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
+ C_40 := sql.subdelta(C_86,C_33,C_37,C_87,C_88);
(X_41,r1_56) := algebra.subjoin(X_32,C_40,nil:BAT,nil:BAT,false,nil:lng);
X_45:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_extendedprice",0);
(C_47,r1_63) := sql.bind(X_6,"sys","lineorder","lo_extendedprice",2);
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
@@ -43,30 +43,30 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_10:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",0);
X_18:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_discount",0);
C_7:bat[:oid] := sql.tid(X_6,"sys","lineorder");
- C_72 := algebra.subselect(X_18,C_7,A1,A2,true,true,false);
+ C_79 := algebra.subselect(X_18,C_7,A1,A2,true,true,false);
(C_20,r1_24) := sql.bind(X_6,"sys","lineorder","lo_discount",2);
- C_73 := algebra.subselect(r1_24,nil:bat[:oid],A1,A2,true,true,false);
+ C_80 := algebra.subselect(r1_24,nil:bat[:oid],A1,A2,true,true,false);
X_22:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_discount",1);
- C_75 := algebra.subselect(X_22,C_7,A1,A2,true,true,false);
- C_23 := sql.subdelta(C_72,C_7,C_20,C_73,C_75);
- C_76 := algebra.subselect(X_10,C_23,A3,A4,true,true,false);
+ C_82 := algebra.subselect(X_22,C_7,A1,A2,true,true,false);
+ C_23 := sql.subdelta(C_79,C_7,C_20,C_80,C_82);
+ C_83 := algebra.subselect(X_10,C_23,A3,A4,true,true,false);
(C_13,r1_13) := sql.bind(X_6,"sys","lineorder","lo_quantity",2);
- C_77 := algebra.subselect(r1_13,nil:bat[:oid],A3,A4,true,true,false);
+ C_84 := algebra.subselect(r1_13,nil:bat[:oid],A3,A4,true,true,false);
X_16:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",1);
- C_78 := algebra.subselect(X_16,C_23,A3,A4,true,true,false);
- C_26 := sql.subdelta(C_76,C_23,C_13,C_77,C_78);
+ C_85 := algebra.subselect(X_16,C_23,A3,A4,true,true,false);
+ C_26 := sql.subdelta(C_83,C_23,C_13,C_84,C_85);
X_27:bat[:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_29,r1_38) :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_31:bat[:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_32 := sql.projectdelta(C_26,X_27,X_29,r1_38,X_31);
X_35:bat[:int] := sql.bind(X_6,"sys","dwdate","d_yearmonthnum",0);
C_33:bat[:oid] := sql.tid(X_6,"sys","dwdate");
- C_79 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
+ C_86 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
(C_37,r1_48) := sql.bind(X_6,"sys","dwdate","d_yearmonthnum",2);
- C_80 := algebra.subselect(r1_48,nil:bat[:oid],A0,A0,true,false,false);
+ C_87 := algebra.subselect(r1_48,nil:bat[:oid],A0,A0,true,false,false);
X_39:bat[:int] := sql.bind(X_6,"sys","dwdate","d_yearmonthnum",1);
- C_81 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
- C_40 := sql.subdelta(C_79,C_33,C_37,C_80,C_81);
+ C_88 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
+ C_40 := sql.subdelta(C_86,C_33,C_37,C_87,C_88);
(X_41,r1_56) := algebra.subjoin(X_32,C_40,nil:BAT,nil:BAT,false,nil:lng);
X_45:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_extendedprice",0);
(C_47,r1_63) := sql.bind(X_6,"sys","lineorder","lo_extendedprice",2);
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
@@ -43,18 +43,18 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_11:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_quantity",0);
X_19:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_discount",0);
C_8:bat[:oid] := sql.tid(X_7,"sys","lineorder");
- C_79 := algebra.subselect(X_19,C_8,A2,A3,true,true,false);
+ C_86 := algebra.subselect(X_19,C_8,A2,A3,true,true,false);
(C_21,r1_25) := sql.bind(X_7,"sys","lineorder","lo_discount",2);
- C_80 := algebra.subselect(r1_25,nil:bat[:oid],A2,A3,true,true,false);
+ C_87 := algebra.subselect(r1_25,nil:bat[:oid],A2,A3,true,true,false);
X_23:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_discount",1);
- C_82 := algebra.subselect(X_23,C_8,A2,A3,true,true,false);
- C_24 := sql.subdelta(C_79,C_8,C_21,C_80,C_82);
- C_83 := algebra.subselect(X_11,C_24,A4,A5,true,true,false);
+ C_89 := algebra.subselect(X_23,C_8,A2,A3,true,true,false);
+ C_24 := sql.subdelta(C_86,C_8,C_21,C_87,C_89);
+ C_90 := algebra.subselect(X_11,C_24,A4,A5,true,true,false);
(C_14,r1_14) := sql.bind(X_7,"sys","lineorder","lo_quantity",2);
- C_84 := algebra.subselect(r1_14,nil:bat[:oid],A4,A5,true,true,false);
+ C_91 := algebra.subselect(r1_14,nil:bat[:oid],A4,A5,true,true,false);
X_17:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_quantity",1);
- C_85 := algebra.subselect(X_17,C_24,A4,A5,true,true,false);
- C_27 := sql.subdelta(C_83,C_24,C_14,C_84,C_85);
+ C_92 := algebra.subselect(X_17,C_24,A4,A5,true,true,false);
+ C_27 := sql.subdelta(C_90,C_24,C_14,C_91,C_92);
X_28:bat[:oid] :=
sql.bind_idxbat(X_7,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_30,r1_39) :=
sql.bind_idxbat(X_7,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_32:bat[:oid] :=
sql.bind_idxbat(X_7,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
@@ -62,18 +62,18 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_36:bat[:int] := sql.bind(X_7,"sys","dwdate","d_weeknuminyear",0);
X_41:bat[:int] := sql.bind(X_7,"sys","dwdate","d_year",0);
C_34:bat[:oid] := sql.tid(X_7,"sys","dwdate");
- C_86 := algebra.subselect(X_41,C_34,A1,A1,true,false,false);
+ C_93 := algebra.subselect(X_41,C_34,A1,A1,true,false,false);
(C_43,r1_57) := sql.bind(X_7,"sys","dwdate","d_year",2);
- C_87 := algebra.subselect(r1_57,nil:bat[:oid],A1,A1,true,false,false);
+ C_94 := algebra.subselect(r1_57,nil:bat[:oid],A1,A1,true,false,false);
X_45:bat[:int] := sql.bind(X_7,"sys","dwdate","d_year",1);
- C_88 := algebra.subselect(X_45,C_34,A1,A1,true,false,false);
- C_46 := sql.subdelta(C_86,C_34,C_43,C_87,C_88);
- C_89 := algebra.subselect(X_36,C_46,A0,A0,true,false,false);
+ C_95 := algebra.subselect(X_45,C_34,A1,A1,true,false,false);
+ C_46 := sql.subdelta(C_93,C_34,C_43,C_94,C_95);
+ C_96 := algebra.subselect(X_36,C_46,A0,A0,true,false,false);
(C_38,r1_49) := sql.bind(X_7,"sys","dwdate","d_weeknuminyear",2);
- C_90 := algebra.subselect(r1_49,nil:bat[:oid],A0,A0,true,false,false);
+ C_97 := algebra.subselect(r1_49,nil:bat[:oid],A0,A0,true,false,false);
X_40:bat[:int] := sql.bind(X_7,"sys","dwdate","d_weeknuminyear",1);
- C_91 := algebra.subselect(X_40,C_46,A0,A0,true,false,false);
- C_47 := sql.subdelta(C_89,C_46,C_38,C_90,C_91);
+ C_98 := algebra.subselect(X_40,C_46,A0,A0,true,false,false);
+ C_47 := sql.subdelta(C_96,C_46,C_38,C_97,C_98);
(X_48,r1_66) := algebra.subjoin(X_33,C_47,nil:BAT,nil:BAT,false,nil:lng);
X_52:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_extendedprice",0);
(C_54,r1_74) := sql.bind(X_7,"sys","lineorder","lo_extendedprice",2);
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
@@ -43,18 +43,18 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_11:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_quantity",0);
X_19:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_discount",0);
C_8:bat[:oid] := sql.tid(X_7,"sys","lineorder");
- C_79 := algebra.subselect(X_19,C_8,A2,A3,true,true,false);
+ C_86 := algebra.subselect(X_19,C_8,A2,A3,true,true,false);
(C_21,r1_25) := sql.bind(X_7,"sys","lineorder","lo_discount",2);
- C_80 := algebra.subselect(r1_25,nil:bat[:oid],A2,A3,true,true,false);
+ C_87 := algebra.subselect(r1_25,nil:bat[:oid],A2,A3,true,true,false);
X_23:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_discount",1);
- C_82 := algebra.subselect(X_23,C_8,A2,A3,true,true,false);
- C_24 := sql.subdelta(C_79,C_8,C_21,C_80,C_82);
- C_83 := algebra.subselect(X_11,C_24,A4,A5,true,true,false);
+ C_89 := algebra.subselect(X_23,C_8,A2,A3,true,true,false);
+ C_24 := sql.subdelta(C_86,C_8,C_21,C_87,C_89);
+ C_90 := algebra.subselect(X_11,C_24,A4,A5,true,true,false);
(C_14,r1_14) := sql.bind(X_7,"sys","lineorder","lo_quantity",2);
- C_84 := algebra.subselect(r1_14,nil:bat[:oid],A4,A5,true,true,false);
+ C_91 := algebra.subselect(r1_14,nil:bat[:oid],A4,A5,true,true,false);
X_17:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_quantity",1);
- C_85 := algebra.subselect(X_17,C_24,A4,A5,true,true,false);
- C_27 := sql.subdelta(C_83,C_24,C_14,C_84,C_85);
+ C_92 := algebra.subselect(X_17,C_24,A4,A5,true,true,false);
+ C_27 := sql.subdelta(C_90,C_24,C_14,C_91,C_92);
X_28:bat[:oid] :=
sql.bind_idxbat(X_7,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_30,r1_39) :=
sql.bind_idxbat(X_7,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_32:bat[:oid] :=
sql.bind_idxbat(X_7,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
@@ -62,18 +62,18 @@ function user.s2_1(A0:int,A1:int,A2:int,
X_36:bat[:int] := sql.bind(X_7,"sys","dwdate","d_weeknuminyear",0);
X_41:bat[:int] := sql.bind(X_7,"sys","dwdate","d_year",0);
C_34:bat[:oid] := sql.tid(X_7,"sys","dwdate");
- C_86 := algebra.subselect(X_41,C_34,A1,A1,true,false,false);
+ C_93 := algebra.subselect(X_41,C_34,A1,A1,true,false,false);
(C_43,r1_57) := sql.bind(X_7,"sys","dwdate","d_year",2);
- C_87 := algebra.subselect(r1_57,nil:bat[:oid],A1,A1,true,false,false);
+ C_94 := algebra.subselect(r1_57,nil:bat[:oid],A1,A1,true,false,false);
X_45:bat[:int] := sql.bind(X_7,"sys","dwdate","d_year",1);
- C_88 := algebra.subselect(X_45,C_34,A1,A1,true,false,false);
- C_46 := sql.subdelta(C_86,C_34,C_43,C_87,C_88);
- C_89 := algebra.subselect(X_36,C_46,A0,A0,true,false,false);
+ C_95 := algebra.subselect(X_45,C_34,A1,A1,true,false,false);
+ C_46 := sql.subdelta(C_93,C_34,C_43,C_94,C_95);
+ C_96 := algebra.subselect(X_36,C_46,A0,A0,true,false,false);
(C_38,r1_49) := sql.bind(X_7,"sys","dwdate","d_weeknuminyear",2);
- C_90 := algebra.subselect(r1_49,nil:bat[:oid],A0,A0,true,false,false);
+ C_97 := algebra.subselect(r1_49,nil:bat[:oid],A0,A0,true,false,false);
X_40:bat[:int] := sql.bind(X_7,"sys","dwdate","d_weeknuminyear",1);
- C_91 := algebra.subselect(X_40,C_46,A0,A0,true,false,false);
- C_47 := sql.subdelta(C_89,C_46,C_38,C_90,C_91);
+ C_98 := algebra.subselect(X_40,C_46,A0,A0,true,false,false);
+ C_47 := sql.subdelta(C_96,C_46,C_38,C_97,C_98);
(X_48,r1_66) := algebra.subjoin(X_33,C_47,nil:BAT,nil:BAT,false,nil:lng);
X_52:bat[:int] := sql.bind(X_7,"sys","lineorder","lo_extendedprice",0);
(C_54,r1_74) := sql.bind(X_7,"sys","lineorder","lo_extendedprice",2);
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
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
