Changeset: 905514376f69 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=905514376f69
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/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/05-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/12-explain.stable.out
sql/benchmarks/tpch/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/16-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/21-explain.stable.out
Branch: Oct2014
Log Message:
Approve new output
diffs (truncated from 1023 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
@@ -54,9 +54,9 @@ function user.s2_1{autoCommit=true}(A0:i
X_16:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",1);
X_95 := algebra.thetasubselect(X_16,X_23,A3,"<");
X_25 := sql.subdelta(X_93,X_23,X_13,X_94,X_95);
- X_27 :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
+ 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 :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
+ 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");
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
@@ -54,9 +54,9 @@ function user.s2_1{autoCommit=true}(A0:i
X_17:bat[:oid,:int] := sql.bind(X_7,"sys","lineorder","lo_quantity",1);
X_95 := algebra.subselect(X_17,X_24,A3,A4,true,true,false);
X_26 := sql.subdelta(X_93,X_24,X_14,X_94,X_95);
- X_27 :=
sql.bind_idxbat(X_7,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
+ 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 :=
sql.bind_idxbat(X_7,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
+ 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");
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
@@ -54,9 +54,9 @@ function user.s2_1{autoCommit=true}(A0:i
X_18:bat[:oid,:int] := sql.bind(X_8,"sys","lineorder","lo_quantity",1);
X_106 := algebra.subselect(X_18,X_25,A4,A5,true,true,false);
X_27 := sql.subdelta(X_104,X_25,X_15,X_105,X_106);
- X_28 :=
sql.bind_idxbat(X_8,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
+ 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 :=
sql.bind_idxbat(X_8,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
+ 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);
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
@@ -43,9 +43,9 @@ Ready.
function user.s2_1{autoCommit=true}(A0:str,A1:str):void;
X_4 := sql.mvc();
X_5:bat[:oid,:oid] := sql.tid(X_4,"sys","lineorder");
- X_8 :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_partkey_fkey",0);
+ X_8:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_partkey_fkey",0);
(X_11,r1_11) :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_partkey_fkey",2);
- X_14 :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_partkey_fkey",1);
+ X_14:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_partkey_fkey",1);
X_16 := sql.projectdelta(X_5,X_8,X_11,r1_11,X_14);
X_19:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_category",0);
X_17:bat[:oid,:oid] := sql.tid(X_4,"sys","part");
@@ -57,9 +57,9 @@ function user.s2_1{autoCommit=true}(A0:s
X_24 := sql.subdelta(X_160,X_17,X_21,X_161,X_162);
X_26 := X_24;
(X_27,r1_31) := algebra.join(X_16,X_26);
- X_29 :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
+ X_29:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
(X_31,r1_35) :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",2);
- X_33 :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",1);
+ X_33:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",1);
X_34 := sql.projectdelta(X_5,X_29,X_31,r1_35,X_33);
X_35 := algebra.leftfetchjoin(X_27,X_34);
X_39:bat[:oid,:str] := sql.bind(X_4,"sys","supplier","s_region",0);
@@ -73,9 +73,9 @@ function user.s2_1{autoCommit=true}(A0:s
X_49 := X_47;
(X_50,r1_58) := algebra.join(X_35,X_49);
X_166 := algebra.leftfetchjoin(X_50,X_27);
- X_52 :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
+ X_52:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_55,r1_63) :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
- X_57 :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
+ X_57:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_58 := sql.projectdelta(X_5,X_52,X_55,r1_63,X_57);
X_59:bat[:oid,:oid] := algebra.leftfetchjoin(X_166,X_58);
X_60:bat[:oid,:oid] := sql.tid(X_4,"sys","dwdate");
diff --git a/sql/benchmarks/ssbm/Tests/05-explain.stable.out
b/sql/benchmarks/ssbm/Tests/05-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/05-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/05-explain.stable.out
@@ -45,9 +45,9 @@ Ready.
function user.s2_1{autoCommit=true}(A0:str,A1:str,A2:str):void;
X_5 := sql.mvc();
X_6:bat[:oid,:oid] := sql.tid(X_5,"sys","lineorder");
- X_9 :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_partkey_fkey",0);
+ X_9:bat[:oid,:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_partkey_fkey",0);
(X_12,r1_12) :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_partkey_fkey",2);
- X_15 :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_partkey_fkey",1);
+ X_15:bat[:oid,:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_partkey_fkey",1);
X_17 := sql.projectdelta(X_6,X_9,X_12,r1_12,X_15);
X_20:bat[:oid,:str] := sql.bind(X_5,"sys","part","p_brand1",0);
X_18:bat[:oid,:oid] := sql.tid(X_5,"sys","part");
@@ -59,9 +59,9 @@ function user.s2_1{autoCommit=true}(A0:s
X_25 := sql.subdelta(X_154,X_18,X_22,X_155,X_156);
X_27 := X_25;
(X_28,r1_33) := algebra.join(X_17,X_27);
- X_30 :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
+ X_30:bat[:oid,:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
(X_32,r1_37) :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_suppkey_fkey",2);
- X_34 :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_suppkey_fkey",1);
+ X_34:bat[:oid,:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_suppkey_fkey",1);
X_37 := sql.projectdelta(X_6,X_30,X_32,r1_37,X_34);
X_38 := algebra.leftfetchjoin(X_28,X_37);
X_41:bat[:oid,:str] := sql.bind(X_5,"sys","supplier","s_region",0);
@@ -75,9 +75,9 @@ function user.s2_1{autoCommit=true}(A0:s
X_51 := X_49;
(X_52,r1_61) := algebra.join(X_38,X_51);
X_160 := algebra.leftfetchjoin(X_52,X_28);
- X_54 :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
+ X_54:bat[:oid,:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_56,r1_65) :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
- X_58 :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
+ X_58:bat[:oid,:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_59 := sql.projectdelta(X_6,X_54,X_56,r1_65,X_58);
X_60:bat[:oid,:oid] := algebra.leftfetchjoin(X_160,X_59);
X_61:bat[:oid,:oid] := sql.tid(X_5,"sys","dwdate");
diff --git a/sql/benchmarks/ssbm/Tests/06-explain.stable.out
b/sql/benchmarks/ssbm/Tests/06-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/06-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/06-explain.stable.out
@@ -45,9 +45,9 @@ Ready.
function user.s2_1{autoCommit=true}(A0:str,A1:str):void;
X_4 := sql.mvc();
X_5:bat[:oid,:oid] := sql.tid(X_4,"sys","lineorder");
- X_8 :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_partkey_fkey",0);
+ X_8:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_partkey_fkey",0);
(X_11,r1_11) :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_partkey_fkey",2);
- X_14 :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_partkey_fkey",1);
+ X_14:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_partkey_fkey",1);
X_16 := sql.projectdelta(X_5,X_8,X_11,r1_11,X_14);
X_19:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_brand1",0);
X_17:bat[:oid,:oid] := sql.tid(X_4,"sys","part");
@@ -59,9 +59,9 @@ function user.s2_1{autoCommit=true}(A0:s
X_24 := sql.subdelta(X_152,X_17,X_21,X_153,X_154);
X_26 := X_24;
(X_27,r1_31) := algebra.join(X_16,X_26);
- X_29 :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
+ X_29:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
(X_31,r1_35) :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",2);
- X_33 :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",1);
+ X_33:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",1);
X_34 := sql.projectdelta(X_5,X_29,X_31,r1_35,X_33);
X_35 := algebra.leftfetchjoin(X_27,X_34);
X_39:bat[:oid,:str] := sql.bind(X_4,"sys","supplier","s_region",0);
@@ -75,9 +75,9 @@ function user.s2_1{autoCommit=true}(A0:s
X_49 := X_47;
(X_50,r1_58) := algebra.join(X_35,X_49);
X_158 := algebra.leftfetchjoin(X_50,X_27);
- X_52 :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
+ X_52:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_55,r1_63) :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
- X_57 :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
+ X_57:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_58 := sql.projectdelta(X_5,X_52,X_55,r1_63,X_57);
X_59:bat[:oid,:oid] := algebra.leftfetchjoin(X_158,X_58);
X_60:bat[:oid,:oid] := sql.tid(X_4,"sys","dwdate");
diff --git a/sql/benchmarks/ssbm/Tests/07-explain.stable.out
b/sql/benchmarks/ssbm/Tests/07-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/07-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/07-explain.stable.out
@@ -44,9 +44,9 @@ Ready.
function user.s2_1{autoCommit=true}(A0:str,A1:str,A2:int,A3:int):void;
X_6 := sql.mvc();
X_7:bat[:oid,:oid] := sql.tid(X_6,"sys","lineorder");
- X_10 :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_custkey_fkey",0);
+ X_10:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_custkey_fkey",0);
(X_13,r1_13) :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_custkey_fkey",2);
- X_16 :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_custkey_fkey",1);
+ X_16:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_custkey_fkey",1);
X_18 := sql.projectdelta(X_7,X_10,X_13,r1_13,X_16);
X_21:bat[:oid,:str] := sql.bind(X_6,"sys","customer","c_region",0);
X_19:bat[:oid,:oid] := sql.tid(X_6,"sys","customer");
@@ -58,9 +58,9 @@ function user.s2_1{autoCommit=true}(A0:s
X_26 := sql.subdelta(X_180,X_19,X_23,X_181,X_182);
X_28 := X_26;
(X_29,r1_33) := algebra.join(X_18,X_28);
- X_31 :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
+ X_31:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
(X_33,r1_37) :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_suppkey_fkey",2);
- X_35 :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_suppkey_fkey",1);
+ X_35:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_suppkey_fkey",1);
X_36 := sql.projectdelta(X_7,X_31,X_33,r1_37,X_35);
X_37 := algebra.leftfetchjoin(X_29,X_36);
X_41:bat[:oid,:str] := sql.bind(X_6,"sys","supplier","s_region",0);
@@ -74,9 +74,9 @@ function user.s2_1{autoCommit=true}(A0:s
X_51 := X_49;
(X_52,r1_60) := algebra.join(X_37,X_51);
X_189 := algebra.leftfetchjoin(X_52,X_29);
- X_54 :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
+ X_54:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_57,r1_65) :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
- X_59 :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
+ X_59:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_60 := sql.projectdelta(X_7,X_54,X_57,r1_65,X_59);
X_61:bat[:oid,:oid] := algebra.leftfetchjoin(X_189,X_60);
X_64:bat[:oid,:int] := sql.bind(X_6,"sys","dwdate","d_year",0);
diff --git a/sql/benchmarks/ssbm/Tests/08-explain.stable.out
b/sql/benchmarks/ssbm/Tests/08-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/08-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/08-explain.stable.out
@@ -44,9 +44,9 @@ Ready.
function user.s2_1{autoCommit=true}(A0:str,A1:str,A2:int,A3:int):void;
X_6 := sql.mvc();
X_7:bat[:oid,:oid] := sql.tid(X_6,"sys","lineorder");
- X_10 :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_custkey_fkey",0);
+ X_10:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_custkey_fkey",0);
(X_13,r1_13) :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_custkey_fkey",2);
- X_16 :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_custkey_fkey",1);
+ X_16:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_custkey_fkey",1);
X_18 := sql.projectdelta(X_7,X_10,X_13,r1_13,X_16);
X_21:bat[:oid,:str] := sql.bind(X_6,"sys","customer","c_nation",0);
X_19:bat[:oid,:oid] := sql.tid(X_6,"sys","customer");
@@ -58,9 +58,9 @@ function user.s2_1{autoCommit=true}(A0:s
X_26 := sql.subdelta(X_180,X_19,X_23,X_181,X_182);
X_28 := X_26;
(X_29,r1_33) := algebra.join(X_18,X_28);
- X_31 :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
+ X_31:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
(X_33,r1_37) :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_suppkey_fkey",2);
- X_35 :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_suppkey_fkey",1);
+ X_35:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_suppkey_fkey",1);
X_36 := sql.projectdelta(X_7,X_31,X_33,r1_37,X_35);
X_37 := algebra.leftfetchjoin(X_29,X_36);
X_41:bat[:oid,:str] := sql.bind(X_6,"sys","supplier","s_nation",0);
@@ -74,9 +74,9 @@ function user.s2_1{autoCommit=true}(A0:s
X_51 := X_49;
(X_52,r1_60) := algebra.join(X_37,X_51);
X_189 := algebra.leftfetchjoin(X_52,X_29);
- X_54 :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
+ X_54:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_57,r1_65) :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
- X_59 :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
+ X_59:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_60 := sql.projectdelta(X_7,X_54,X_57,r1_65,X_59);
X_61:bat[:oid,:oid] := algebra.leftfetchjoin(X_189,X_60);
X_64:bat[:oid,:int] := sql.bind(X_6,"sys","dwdate","d_year",0);
diff --git a/sql/benchmarks/ssbm/Tests/09-explain.stable.out
b/sql/benchmarks/ssbm/Tests/09-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/09-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/09-explain.stable.out
@@ -46,9 +46,9 @@ Ready.
function
user.s2_1{autoCommit=true}(A0:str,A1:str,A2:str,A3:str,A4:str,A5:str,A6:int,A7:int):void;
X_10 := sql.mvc();
X_11:bat[:oid,:oid] := sql.tid(X_10,"sys","lineorder");
- X_14 :=
sql.bind_idxbat(X_10,"sys","lineorder","lineorder_lo_custkey_fkey",0);
+ X_14:bat[:oid,:oid] :=
sql.bind_idxbat(X_10,"sys","lineorder","lineorder_lo_custkey_fkey",0);
(X_17,r1_17) :=
sql.bind_idxbat(X_10,"sys","lineorder","lineorder_lo_custkey_fkey",2);
- X_20 :=
sql.bind_idxbat(X_10,"sys","lineorder","lineorder_lo_custkey_fkey",1);
+ X_20:bat[:oid,:oid] :=
sql.bind_idxbat(X_10,"sys","lineorder","lineorder_lo_custkey_fkey",1);
X_22 := sql.projectdelta(X_11,X_14,X_17,r1_17,X_20);
X_25:bat[:oid,:str] := sql.bind(X_10,"sys","customer","c_city",0);
X_30:bat[:oid,:str] := sql.bind(X_10,"sys","customer","c_nation",0);
@@ -72,9 +72,9 @@ function user.s2_1{autoCommit=true}(A0:s
X_40 := bat.mergecand(X_38,X_39);
X_41 := X_40;
(X_42,r1_50) := algebra.join(X_22,X_41);
- X_44 :=
sql.bind_idxbat(X_10,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
+ X_44:bat[:oid,:oid] :=
sql.bind_idxbat(X_10,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
(X_49,r1_57) :=
sql.bind_idxbat(X_10,"sys","lineorder","lineorder_lo_suppkey_fkey",2);
- X_52 :=
sql.bind_idxbat(X_10,"sys","lineorder","lineorder_lo_suppkey_fkey",1);
+ X_52:bat[:oid,:oid] :=
sql.bind_idxbat(X_10,"sys","lineorder","lineorder_lo_suppkey_fkey",1);
X_54 := sql.projectdelta(X_11,X_44,X_49,r1_57,X_52);
X_55 := algebra.leftfetchjoin(X_42,X_54);
X_58:bat[:oid,:str] := sql.bind(X_10,"sys","supplier","s_city",0);
@@ -100,9 +100,9 @@ function user.s2_1{autoCommit=true}(A0:s
X_74 := X_73;
(X_75,r1_91) := algebra.join(X_55,X_74);
X_213 := algebra.leftfetchjoin(X_75,X_42);
- X_77 :=
sql.bind_idxbat(X_10,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
+ X_77:bat[:oid,:oid] :=
sql.bind_idxbat(X_10,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_82,r1_98) :=
sql.bind_idxbat(X_10,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
- X_85 :=
sql.bind_idxbat(X_10,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
+ X_85:bat[:oid,:oid] :=
sql.bind_idxbat(X_10,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_87 := sql.projectdelta(X_11,X_77,X_82,r1_98,X_85);
X_88:bat[:oid,:oid] := algebra.leftfetchjoin(X_213,X_87);
X_91:bat[:oid,:int] := sql.bind(X_10,"sys","dwdate","d_year",0);
diff --git a/sql/benchmarks/ssbm/Tests/10-explain.stable.out
b/sql/benchmarks/ssbm/Tests/10-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/10-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/10-explain.stable.out
@@ -46,9 +46,9 @@ Ready.
function
user.s2_1{autoCommit=true}(A0:str,A1:str,A2:str,A3:str,A4:str,A5:str,A6:str):void;
X_9 := sql.mvc();
X_10:bat[:oid,:oid] := sql.tid(X_9,"sys","lineorder");
- X_13 :=
sql.bind_idxbat(X_9,"sys","lineorder","lineorder_lo_custkey_fkey",0);
+ X_13:bat[:oid,:oid] :=
sql.bind_idxbat(X_9,"sys","lineorder","lineorder_lo_custkey_fkey",0);
(X_16,r1_16) :=
sql.bind_idxbat(X_9,"sys","lineorder","lineorder_lo_custkey_fkey",2);
- X_19 :=
sql.bind_idxbat(X_9,"sys","lineorder","lineorder_lo_custkey_fkey",1);
+ X_19:bat[:oid,:oid] :=
sql.bind_idxbat(X_9,"sys","lineorder","lineorder_lo_custkey_fkey",1);
X_21 := sql.projectdelta(X_10,X_13,X_16,r1_16,X_19);
X_24:bat[:oid,:str] := sql.bind(X_9,"sys","customer","c_city",0);
X_29:bat[:oid,:str] := sql.bind(X_9,"sys","customer","c_nation",0);
@@ -72,9 +72,9 @@ function user.s2_1{autoCommit=true}(A0:s
X_39 := bat.mergecand(X_37,X_38);
X_40 := X_39;
(X_41,r1_49) := algebra.join(X_21,X_40);
- X_43 :=
sql.bind_idxbat(X_9,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
+ X_43:bat[:oid,:oid] :=
sql.bind_idxbat(X_9,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
