Changeset: 96b1c7856377 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=96b1c7856377
Modified Files:
clients/Tests/exports.stable.out
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
sql/backends/monet5/sql_optimizer.c
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/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
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.int128
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.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-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
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/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:
Dropping a few more optimizer properties
They are not used by the system anymore
diffs (truncated from 2628 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
@@ -2175,9 +2175,7 @@ int hasSideEffects(InstrPtr p, int stric
str hashRef;
int have_hge;
str hgeRef;
-int hlbProp;
int horiginProp;
-int hubProp;
str identityRef;
str ifthenelseRef;
str ilikeRef;
@@ -2591,12 +2589,10 @@ timestamp *timestamp_nil;
int timestamp_tostr(str *buf, int *len, const timestamp *val);
int timestamp_tz_fromstr(const char *buf, int *len, timestamp **ret);
int timestamp_tz_tostr(str *buf, int *len, const timestamp *val, const tzone
*timezone);
-int tlbProp;
int toriginProp;
void trimMalBlk(MalBlkPtr mb);
void trimMalVariables(MalBlkPtr mb, MalStkPtr stk);
void trimMalVariables_(MalBlkPtr mb, bit *used, MalStkPtr glb);
-int tubProp;
void typeChecker(stream *out, Module scope, MalBlkPtr mb, InstrPtr p, int
silent);
int tzone_fromstr(const char *buf, int *len, tzone **d);
tzone tzone_local;
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
@@ -462,11 +462,6 @@ void optimizerInit(void)
orderDependendProp = PropertyIndex("orderdependend");
sqlfunctionProp = PropertyIndex("sqlfunction");
- hlbProp = PropertyIndex("hlb");
- hubProp = PropertyIndex("hub");
- tlbProp = PropertyIndex("tlb");
- tubProp = PropertyIndex("tub");
-
horiginProp = PropertyIndex("horigin");
toriginProp = PropertyIndex("torigin");
mtProp = PropertyIndex("mergetable");
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
@@ -234,10 +234,6 @@ opt_export int runonceProp; /* binary *
opt_export int unsafeProp; /* binary */
opt_export int orderDependendProp; /* binary */
-opt_export int hlbProp; /* any (head lower bound) */
-opt_export int hubProp; /* any (head upper bound) */
-opt_export int tlbProp; /* any (tail lower bound) */
-opt_export int tubProp; /* any (tail upper bound) */
opt_export int horiginProp; /* original oid source */
opt_export int toriginProp; /* original oid source */
opt_export int mtProp;
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
@@ -184,17 +184,17 @@ SQLgetStatistics(Client cntxt, mvc *m, M
varSetProp(mb, k, mtProp, op_eq, VALset(&vr,
TYPE_int, &mt_member));
{
- int lowprop = hlbProp, highprop = hubProp;
+ //int lowprop = hlbProp, highprop = hubProp;
/* rows == cnt has been checked above to be <=
GDK_oid_max */
- oid low = 0, high = low + (oid) rows;
+ //oid low = 0, high = low + (oid) rows;
pushInstruction(mb, p);
- if (mode == RD_INS) {
- low = high;
- high += 1024 * 1024;
- }
- varSetProp(mb, getArg(p, 0), lowprop, op_gte,
VALset(&vr, TYPE_oid, &low));
- varSetProp(mb, getArg(p, 0), highprop, op_lt,
VALset(&vr, TYPE_oid, &high));
+ //if (mode == RD_INS) {
+ //low = high;
+ //high += 1024 * 1024;
+ //}
+ //varSetProp(mb, getArg(p, 0), lowprop, op_gte,
VALset(&vr, TYPE_oid, &low));
+ //varSetProp(mb, getArg(p, 0), highprop, op_lt,
VALset(&vr, TYPE_oid, &high));
}
} else {
pushInstruction(mb, p);
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_88 := algebra.subselect(X_18,C_7,A1,A2,true,true,false);
+ C_83 := 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_89 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A1,A2,true,true,false);
+ C_84 := 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_91 := algebra.subselect(X_22,C_7,A1,A2,true,true,false);
- C_23 := sql.subdelta(C_88,C_7,C_20,C_89,C_91);
- C_92 := algebra.thetasubselect(X_10,C_23,A3,"<");
+ C_86 := algebra.subselect(X_22,C_7,A1,A2,true,true,false);
+ C_23 := sql.subdelta(C_83,C_7,C_20,C_84,C_86);
+ C_87 := algebra.thetasubselect(X_10,C_23,A3,"<");
(C_13,r1_13) := sql.bind(X_6,"sys","lineorder","lo_quantity",2);
- C_93 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
+ C_88 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
X_16:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",1);
- C_94 := algebra.thetasubselect(X_16,C_23,A3,"<");
- C_25 := sql.subdelta(C_92,C_23,C_13,C_93,C_94);
+ C_89 := algebra.thetasubselect(X_16,C_23,A3,"<");
+ C_25 := sql.subdelta(C_87,C_23,C_13,C_88,C_89);
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_95 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
+ C_90 := 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_96 := algebra.subselect(r1_46,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ C_91 := 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_97 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
- C_40 := sql.subdelta(C_95,C_33,C_37,C_96,C_97);
+ C_92 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
+ C_40 := sql.subdelta(C_90,C_33,C_37,C_91,C_92);
(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.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_88 := algebra.subselect(X_19,C_8,A1,A2,true,true,false);
+ C_83 := 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_89 := algebra.subselect(r1_25,nil:bat[:oid,:oid],A1,A2,true,true,false);
+ C_84 := 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_91 := algebra.subselect(X_23,C_8,A1,A2,true,true,false);
- C_24 := sql.subdelta(C_88,C_8,C_21,C_89,C_91);
- C_92 := algebra.subselect(X_11,C_24,A3,A4,true,true,false);
+ C_86 := algebra.subselect(X_23,C_8,A1,A2,true,true,false);
+ C_24 := sql.subdelta(C_83,C_8,C_21,C_84,C_86);
+ C_87 := 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_93 := algebra.subselect(r1_14,nil:bat[:oid,:oid],A3,A4,true,true,false);
+ C_88 := 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_94 := algebra.subselect(X_17,C_24,A3,A4,true,true,false);
- C_26 := sql.subdelta(C_92,C_24,C_14,C_93,C_94);
+ C_89 := algebra.subselect(X_17,C_24,A3,A4,true,true,false);
+ C_26 := sql.subdelta(C_87,C_24,C_14,C_88,C_89);
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_95 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
+ C_90 := 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_96 := algebra.subselect(r1_47,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ C_91 := 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_97 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
- C_40 := sql.subdelta(C_95,C_33,C_37,C_96,C_97);
+ C_92 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
+ C_40 := sql.subdelta(C_90,C_33,C_37,C_91,C_92);
(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/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{autoCommit=true}(A0:i
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);
C_9:bat[:oid,:oid] := sql.tid(X_8,"sys","lineorder");
- C_97 := algebra.subselect(X_20,C_9,A2,A3,true,true,false);
+ C_92 := algebra.subselect(X_20,C_9,A2,A3,true,true,false);
(C_22,r1_26) := sql.bind(X_8,"sys","lineorder","lo_discount",2);
- C_98 := algebra.subselect(r1_26,nil:bat[:oid,:oid],A2,A3,true,true,false);
+ C_93 := 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);
- C_100 := algebra.subselect(X_24,C_9,A2,A3,true,true,false);
- C_25 := sql.subdelta(C_97,C_9,C_22,C_98,C_100);
- C_101 := algebra.subselect(X_12,C_25,A4,A5,true,true,false);
+ C_95 := algebra.subselect(X_24,C_9,A2,A3,true,true,false);
+ C_25 := sql.subdelta(C_92,C_9,C_22,C_93,C_95);
+ C_96 := algebra.subselect(X_12,C_25,A4,A5,true,true,false);
(C_15,r1_15) := sql.bind(X_8,"sys","lineorder","lo_quantity",2);
- C_102 := algebra.subselect(r1_15,nil:bat[:oid,:oid],A4,A5,true,true,false);
+ C_97 := 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);
- C_103 := algebra.subselect(X_18,C_25,A4,A5,true,true,false);
- C_27 := sql.subdelta(C_101,C_25,C_15,C_102,C_103);
+ C_98 := algebra.subselect(X_18,C_25,A4,A5,true,true,false);
+ C_27 := sql.subdelta(C_96,C_25,C_15,C_97,C_98);
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_36:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",0);
X_41:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_year",0);
C_34:bat[:oid,:oid] := sql.tid(X_8,"sys","dwdate");
- C_104 := algebra.subselect(X_41,C_34,A1,A1,true,false,false);
+ C_99 := algebra.subselect(X_41,C_34,A1,A1,true,false,false);
(C_43,r1_56) := sql.bind(X_8,"sys","dwdate","d_year",2);
- C_105 :=
algebra.subselect(r1_56,nil:bat[:oid,:oid],A1,A1,true,false,false);
+ C_100 :=
algebra.subselect(r1_56,nil:bat[:oid,:oid],A1,A1,true,false,false);
X_45:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_year",1);
- C_106 := algebra.subselect(X_45,C_34,A1,A1,true,false,false);
- C_46 := sql.subdelta(C_104,C_34,C_43,C_105,C_106);
- C_107 := algebra.subselect(X_36,C_46,A0,A0,true,false,false);
+ C_101 := algebra.subselect(X_45,C_34,A1,A1,true,false,false);
+ C_46 := sql.subdelta(C_99,C_34,C_43,C_100,C_101);
+ C_102 := algebra.subselect(X_36,C_46,A0,A0,true,false,false);
(C_38,r1_48) := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",2);
- C_108 :=
algebra.subselect(r1_48,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ C_103 :=
algebra.subselect(r1_48,nil:bat[:oid,:oid],A0,A0,true,false,false);
X_40:bat[:oid,:int] := sql.bind(X_8,"sys","dwdate","d_weeknuminyear",1);
- C_109 := algebra.subselect(X_40,C_46,A0,A0,true,false,false);
- C_47 := sql.subdelta(C_107,C_46,C_38,C_108,C_109);
+ C_104 := algebra.subselect(X_40,C_46,A0,A0,true,false,false);
+ C_47 := sql.subdelta(C_102,C_46,C_38,C_103,C_104);
(X_48,r1_66) := algebra.subjoin(X_33,C_47,nil:BAT,nil:BAT,false,nil:lng);
X_52:bat[:oid,:int] :=
sql.bind(X_8,"sys","lineorder","lo_extendedprice",0);
(C_54,r1_74) := sql.bind(X_8,"sys","lineorder","lo_extendedprice",2);
diff --git a/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
b/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
@@ -70,12 +70,12 @@ function user.s2_1{autoCommit=true}(A0:s
X_16 := sql.projectdelta(C_5,X_8,X_11,r1_11,X_14);
X_19:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_category",0);
C_17:bat[:oid,:oid] := sql.tid(X_4,"sys","part");
- C_167 := algebra.subselect(X_19,C_17,A0,A0,true,false,false);
+ C_158 := algebra.subselect(X_19,C_17,A0,A0,true,false,false);
(C_21,r1_22) := sql.bind(X_4,"sys","part","p_category",2);
- C_168 :=
algebra.subselect(r1_22,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ C_159 :=
algebra.subselect(r1_22,nil:bat[:oid,:oid],A0,A0,true,false,false);
X_23:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_category",1);
- C_170 := algebra.subselect(X_23,C_17,A0,A0,true,false,false);
- C_24 := sql.subdelta(C_167,C_17,C_21,C_168,C_170);
+ C_161 := algebra.subselect(X_23,C_17,A0,A0,true,false,false);
+ C_24 := sql.subdelta(C_158,C_17,C_21,C_159,C_161);
(X_26,r1_32) := algebra.subjoin(X_16,C_24,nil:BAT,nil:BAT,false,nil:lng);
X_30:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
(X_32,r1_39) :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_suppkey_fkey",2);
@@ -84,12 +84,12 @@ function user.s2_1{autoCommit=true}(A0:s
X_36 := algebra.leftfetchjoin(X_26,X_35);
X_39:bat[:oid,:str] := sql.bind(X_4,"sys","supplier","s_region",0);
C_37:bat[:oid,:oid] := sql.tid(X_4,"sys","supplier");
- C_171 := algebra.subselect(X_39,C_37,A1,A1,true,false,false);
+ C_162 := algebra.subselect(X_39,C_37,A1,A1,true,false,false);
(C_41,r1_49) := sql.bind(X_4,"sys","supplier","s_region",2);
- C_172 :=
algebra.subselect(r1_49,nil:bat[:oid,:oid],A1,A1,true,false,false);
+ C_163 :=
algebra.subselect(r1_49,nil:bat[:oid,:oid],A1,A1,true,false,false);
X_43:bat[:oid,:str] := sql.bind(X_4,"sys","supplier","s_region",1);
- C_173 := algebra.subselect(X_43,C_37,A1,A1,true,false,false);
- C_44 := sql.subdelta(C_171,C_37,C_41,C_172,C_173);
+ C_164 := algebra.subselect(X_43,C_37,A1,A1,true,false,false);
+ C_44 := sql.subdelta(C_162,C_37,C_41,C_163,C_164);
(X_45,r1_58) := algebra.subjoin(X_36,C_44,nil:BAT,nil:BAT,false,nil:lng);
X_47:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_49,r1_62) :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
diff --git a/sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
b/sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
@@ -72,12 +72,12 @@ function user.s2_1{autoCommit=true}(A0:s
X_17 := sql.projectdelta(C_6,X_9,X_12,r1_12,X_15);
X_20:bat[:oid,:str] := sql.bind(X_5,"sys","part","p_brand1",0);
C_18:bat[:oid,:oid] := sql.tid(X_5,"sys","part");
- C_161 := algebra.subselect(X_20,C_18,A0,A1,true,true,false);
+ C_152 := algebra.subselect(X_20,C_18,A0,A1,true,true,false);
(C_22,r1_23) := sql.bind(X_5,"sys","part","p_brand1",2);
- C_162 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A0,A1,true,true,false);
+ C_153 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A0,A1,true,true,false);
X_24:bat[:oid,:str] := sql.bind(X_5,"sys","part","p_brand1",1);
- C_164 := algebra.subselect(X_24,C_18,A0,A1,true,true,false);
- C_25 := sql.subdelta(C_161,C_18,C_22,C_162,C_164);
+ C_155 := algebra.subselect(X_24,C_18,A0,A1,true,true,false);
+ C_25 := sql.subdelta(C_152,C_18,C_22,C_153,C_155);
(X_27,r1_33) := algebra.subjoin(X_17,C_25,nil:BAT,nil:BAT,false,nil:lng);
X_31:bat[:oid,:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_suppkey_fkey",0);
(X_33,r1_40) :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_suppkey_fkey",2);
@@ -86,12 +86,12 @@ function user.s2_1{autoCommit=true}(A0:s
X_37 := algebra.leftfetchjoin(X_27,X_36);
X_40:bat[:oid,:str] := sql.bind(X_5,"sys","supplier","s_region",0);
C_38:bat[:oid,:oid] := sql.tid(X_5,"sys","supplier");
- C_165 := algebra.subselect(X_40,C_38,A2,A2,true,false,false);
+ C_156 := algebra.subselect(X_40,C_38,A2,A2,true,false,false);
(C_42,r1_50) := sql.bind(X_5,"sys","supplier","s_region",2);
- C_166 :=
algebra.subselect(r1_50,nil:bat[:oid,:oid],A2,A2,true,false,false);
+ C_157 :=
algebra.subselect(r1_50,nil:bat[:oid,:oid],A2,A2,true,false,false);
X_44:bat[:oid,:str] := sql.bind(X_5,"sys","supplier","s_region",1);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
