Changeset: e4e4adbf3704 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e4e4adbf3704
Modified Files:
clients/Tests/exports.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
sql/backends/monet5/sql_optimizer.c
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.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
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.int128
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:
Remove rowcnt property, step 2
diffs (truncated from 3850 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2476,7 +2476,6 @@ str resultSetRef;
str reuseRef;
malType reverseBatType(malType v);
str row_numberRef;
-int rowsProp;
str rpcRef;
str rsColumnRef;
int rule_fromstr(const char *buf, int *len, rule **d);
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
@@ -30,16 +30,16 @@ stderr of test 'opt_sql_append` in direc
# 22:58:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome"
"--port=36275"
# 22:58:57 >
-MAPI = (monetdb) /var/tmp/mtest-2532/.s.monetdb.37557
+MAPI = (monetdb) /var/tmp/mtest-3121/.s.monetdb.38104
QUERY = explain copy into ttt from '\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-2532/.s.monetdb.37557
+MAPI = (monetdb) /var/tmp/mtest-3121/.s.monetdb.38104
QUERY = explain copy into ttt from 'a:\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: a:\tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-2532/.s.monetdb.37557
+MAPI = (monetdb) /var/tmp/mtest-3121/.s.monetdb.38104
QUERY = explain copy into ttt from '\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-2532/.s.monetdb.37557
+MAPI = (monetdb) /var/tmp/mtest-3121/.s.monetdb.38104
QUERY = explain copy into ttt from 'Z:/tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: Z:/tmp/xyz
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -64,10 +64,10 @@ Ready.
% 133 # length
function user.s4_1{autoCommit=true}():void;
X_25:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe",12);
-barrier X_35 := language.dataflow();
+barrier X_34 := language.dataflow();
X_2 := sql.mvc();
(X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0);
-exit X_35;
+exit X_34;
X_15 := sql.append(X_2,"sys","ttt","a",X_12);
X_19 := sql.append(X_15,"sys","ttt","b",X_13);
X_21 := sql.append(X_19,"sys","ttt","c",X_14);
@@ -98,10 +98,10 @@ end user.s4_1;
% 133 # length
function user.s12_1{autoCommit=true}():void;
X_25:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","user_1",12);
-barrier X_36 := language.dataflow();
+barrier X_35 := language.dataflow();
X_2 := sql.mvc();
(X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0);
-exit X_36;
+exit X_35;
X_15 := sql.append(X_2,"sys","ttt","a",X_12);
X_19 := sql.append(X_15,"sys","ttt","b",X_13);
X_23 := aggr.count(X_14);
diff --git a/monetdb5/optimizer/opt_costModel.c
b/monetdb5/optimizer/opt_costModel.c
--- a/monetdb5/optimizer/opt_costModel.c
+++ b/monetdb5/optimizer/opt_costModel.c
@@ -13,13 +13,11 @@
* The cost formula are repetative
*/
#define newRows(W,X,Y,Z) {\
- ValRecord v;\
c1 = getRowCnt(mb, getArg(p,W));\
c2 = getRowCnt(mb, getArg(p,X));\
if (c1 == -1 || c2 == -1) \
continue;\
- k = (Y);\
- varSetProp(mb, getArg(p,Z), rowsProp, op_eq,
VALset(&v,TYPE_wrd,&k));\
+ setRowCnt(mb, getArg(p,Z), (BUN)(Y));\
}
/*
* The cost will be used in many places to make decisions.
@@ -35,7 +33,7 @@ int
OPTcostModelImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci)
{
int i;
- wrd k, c1, c2;
+ wrd c1, c2;
InstrPtr p;
(void) cntxt;
@@ -133,11 +131,8 @@ OPTcostModelImplementation(Client cntxt,
} else if( p->token == ASSIGNsymbol && p->argc== 2){
/* copy the rows property */
c1 = getRowCnt(mb, getArg(p,1));
- if (c1 != -1) {
- ValRecord v;
-
- varSetProp(mb, getArg(p,0), rowsProp, op_eq,
VALset(&v, TYPE_wrd, &c1));
- }
+ if (c1 != -1)
+ setRowCnt(mb, getArg(p,0), c1);
}
}
return 1;
diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c
--- a/monetdb5/optimizer/opt_prelude.c
+++ b/monetdb5/optimizer/opt_prelude.c
@@ -233,7 +233,6 @@ str zero_or_oneRef;
int sqlfunctionProp;
int inlineProp;
-int rowsProp;
int unsafeProp;
int horiginProp; /* original oid source */
@@ -458,7 +457,6 @@ void optimizerInit(void)
userRef = putName("user",4);
inlineProp = PropertyIndex("inline");
- rowsProp = PropertyIndex("rows");
unsafeProp = PropertyIndex("unsafe");
sqlfunctionProp = PropertyIndex("sqlfunction");
diff --git a/monetdb5/optimizer/opt_prelude.h b/monetdb5/optimizer/opt_prelude.h
--- a/monetdb5/optimizer/opt_prelude.h
+++ b/monetdb5/optimizer/opt_prelude.h
@@ -233,7 +233,6 @@ opt_export str zero_or_oneRef;
opt_export int sqlfunctionProp;
opt_export int inlineProp; /* binary */
-opt_export int rowsProp; /* long */
opt_export int unsafeProp; /* binary */
opt_export int horiginProp; /* original oid source */
diff --git a/sql/backends/monet5/sql_optimizer.c
b/sql/backends/monet5/sql_optimizer.c
--- a/sql/backends/monet5/sql_optimizer.c
+++ b/sql/backends/monet5/sql_optimizer.c
@@ -144,7 +144,6 @@ static void SQLgetStatistics(Client cntx
}
}
if (rows > 1 && mode != RD_INS)
- //varSetProp(mb, k, rowsProp, op_eq,
VALset(&vr, TYPE_wrd, &rows));
setRowCnt(mb,k,rows);
if (mt_member && mode != RD_INS)
varSetProp(mb, k, mtProp, op_eq, VALset(&vr,
TYPE_int, &mt_member));
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{autoCommit=true}(A0:i
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);
C_7:bat[:oid,:oid] := sql.tid(X_6,"sys","lineorder");
- C_75 := algebra.subselect(X_18,C_7,A1,A2,true,true,false);
+ C_71 := 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_76 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A1,A2,true,true,false);
+ C_72 := 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);
- C_78 := algebra.subselect(X_22,C_7,A1,A2,true,true,false);
- C_23 := sql.subdelta(C_75,C_7,C_20,C_76,C_78);
- C_79 := algebra.thetasubselect(X_10,C_23,A3,"<");
+ C_74 := algebra.subselect(X_22,C_7,A1,A2,true,true,false);
+ C_23 := sql.subdelta(C_71,C_7,C_20,C_72,C_74);
+ C_75 := algebra.thetasubselect(X_10,C_23,A3,"<");
(C_13,r1_13) := sql.bind(X_6,"sys","lineorder","lo_quantity",2);
- C_80 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
+ C_76 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
X_16:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",1);
- C_81 := algebra.thetasubselect(X_16,C_23,A3,"<");
- C_25 := sql.subdelta(C_79,C_23,C_13,C_80,C_81);
+ C_77 := algebra.thetasubselect(X_16,C_23,A3,"<");
+ C_25 := sql.subdelta(C_75,C_23,C_13,C_76,C_77);
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(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_82 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
+ C_78 := 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_83 := algebra.subselect(r1_46,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ C_79 := 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_84 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
- C_40 := sql.subdelta(C_82,C_33,C_37,C_83,C_84);
+ C_80 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
+ C_40 := sql.subdelta(C_78,C_33,C_37,C_79,C_80);
(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);
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{autoCommit=true}(A0:i
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);
C_7:bat[:oid,:oid] := sql.tid(X_6,"sys","lineorder");
- C_75 := algebra.subselect(X_18,C_7,A1,A2,true,true,false);
+ C_71 := 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_76 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A1,A2,true,true,false);
+ C_72 := 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);
- C_78 := algebra.subselect(X_22,C_7,A1,A2,true,true,false);
- C_23 := sql.subdelta(C_75,C_7,C_20,C_76,C_78);
- C_79 := algebra.thetasubselect(X_10,C_23,A3,"<");
+ C_74 := algebra.subselect(X_22,C_7,A1,A2,true,true,false);
+ C_23 := sql.subdelta(C_71,C_7,C_20,C_72,C_74);
+ C_75 := algebra.thetasubselect(X_10,C_23,A3,"<");
(C_13,r1_13) := sql.bind(X_6,"sys","lineorder","lo_quantity",2);
- C_80 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
+ C_76 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
X_16:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",1);
- C_81 := algebra.thetasubselect(X_16,C_23,A3,"<");
- C_25 := sql.subdelta(C_79,C_23,C_13,C_80,C_81);
+ C_77 := algebra.thetasubselect(X_16,C_23,A3,"<");
+ C_25 := sql.subdelta(C_75,C_23,C_13,C_76,C_77);
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(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_82 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
+ C_78 := 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_83 := algebra.subselect(r1_46,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ C_79 := 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_84 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
- C_40 := sql.subdelta(C_82,C_33,C_37,C_83,C_84);
+ C_80 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
+ C_40 := sql.subdelta(C_78,C_33,C_37,C_79,C_80);
(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);
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{autoCommit=true}(A0:i
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);
C_8:bat[:oid,:oid] := sql.tid(X_7,"sys","lineorder");
- C_75 := algebra.subselect(X_19,C_8,A1,A2,true,true,false);
+ C_71 := 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_76 := algebra.subselect(r1_25,nil:bat[:oid,:oid],A1,A2,true,true,false);
+ C_72 := 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);
- C_78 := algebra.subselect(X_23,C_8,A1,A2,true,true,false);
- C_24 := sql.subdelta(C_75,C_8,C_21,C_76,C_78);
- C_79 := algebra.subselect(X_11,C_24,A3,A4,true,true,false);
+ C_74 := algebra.subselect(X_23,C_8,A1,A2,true,true,false);
+ C_24 := sql.subdelta(C_71,C_8,C_21,C_72,C_74);
+ C_75 := 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_80 := algebra.subselect(r1_14,nil:bat[:oid,:oid],A3,A4,true,true,false);
+ C_76 := 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);
- C_81 := algebra.subselect(X_17,C_24,A3,A4,true,true,false);
- C_26 := sql.subdelta(C_79,C_24,C_14,C_80,C_81);
+ C_77 := algebra.subselect(X_17,C_24,A3,A4,true,true,false);
+ C_26 := sql.subdelta(C_75,C_24,C_14,C_76,C_77);
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(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_82 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
+ C_78 := 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_83 := algebra.subselect(r1_47,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ C_79 := 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_84 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
- C_40 := sql.subdelta(C_82,C_33,C_37,C_83,C_84);
+ C_80 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
+ C_40 := sql.subdelta(C_78,C_33,C_37,C_79,C_80);
(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);
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{autoCommit=true}(A0:i
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);
C_8:bat[:oid,:oid] := sql.tid(X_7,"sys","lineorder");
- C_75 := algebra.subselect(X_19,C_8,A1,A2,true,true,false);
+ C_71 := 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_76 := algebra.subselect(r1_25,nil:bat[:oid,:oid],A1,A2,true,true,false);
+ C_72 := 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);
- C_78 := algebra.subselect(X_23,C_8,A1,A2,true,true,false);
- C_24 := sql.subdelta(C_75,C_8,C_21,C_76,C_78);
- C_79 := algebra.subselect(X_11,C_24,A3,A4,true,true,false);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
