Changeset: 222e2534a70c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=222e2534a70c
Modified Files:
clients/Tests/exports.stable.out
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/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
Branch: default
Log Message:
Approve output
diffs (truncated from 1977 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
@@ -1983,6 +1983,7 @@ str batcalcRef;
str batmalRef;
str batmmathRef;
str batmtimeRef;
+str batsqlRef;
str batstrRef;
str batxmlRef;
str bbpRef;
@@ -1990,7 +1991,6 @@ str bindRef;
str binddbatRef;
str bindidxRef;
var_t blobsize(size_t nitems);
-str boxRef;
str bpmRef;
str bstreamRef;
int bstream_create_wrap(Bstream *BS, Stream *S, int *bufsize);
@@ -2064,9 +2064,11 @@ void delVariable(MalBlkPtr mb, int varid
str deleteRef;
void deleteSymbol(Module scope, Symbol prg);
str deltaRef;
+str dense_rankRef;
str depositRef;
void deriveModule(Module scope, str nme);
malType destinationType(MalBlkPtr mb, InstrPtr p);
+str diffRef;
str disconnectRef;
void displayVolume(Client cntxt, lng vol);
str divRef;
@@ -2085,7 +2087,6 @@ str exportOperationRef;
str export_tableRef;
int fcnBinder(stream *out, Module scope, MalBlkPtr mb, InstrPtr p);
str fcnDefinition(MalBlkPtr mb, InstrPtr p, str s, int flg, str base, size_t
len);
-int fileProp;
int findGDKtype(int type);
int findInstruction(Module scope, MalBlkPtr mb, InstrPtr pci);
Module findModule(Module scope, str name);
@@ -2240,7 +2241,6 @@ str iteratorRef;
str joinPathRef;
str joinRef;
str jsonRef;
-str kdifferenceRef;
str languageRef;
str leftfetchjoinPathRef;
str leftfetchjoinRef;
@@ -2448,6 +2448,7 @@ str putName(const char *nme, size_t len)
str putRef;
str queryRef;
str querylogRef;
+str rankRef;
str rapiRef;
int readConsole(Client cntxt);
MalStkPtr reallocGlobalStack(MalStkPtr s, int cnt);
@@ -2478,6 +2479,7 @@ int resolveType(int dsttype, int srctype
str resultSetRef;
str reuseRef;
malType reverseBatType(malType v);
+str row_numberRef;
int rowsProp;
str rpcRef;
str rsColumnRef;
@@ -2488,7 +2490,6 @@ str runMALDebugger(Client cntxt, Symbol
str runMALdataflow(Client cntxt, MalBlkPtr mb, int startpc, int stoppc,
MalStkPtr stk);
str runMALsequence(Client cntxt, MalBlkPtr mb, int startpc, int stoppc,
MalStkPtr stk, MalStkPtr env, InstrPtr pcicaller);
str runScenario(Client c);
-int runonceProp;
void runtimeProfileBegin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci, RuntimeProfile prof);
void runtimeProfileExit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci, RuntimeProfile prof);
void runtimeProfileFinish(Client cntxt, MalBlkPtr mb);
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_83 := algebra.subselect(X_18,C_7,A1,A2,true,true,false);
+ C_75 := 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_84 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A1,A2,true,true,false);
+ C_76 := 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_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_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_13,r1_13) := sql.bind(X_6,"sys","lineorder","lo_quantity",2);
- C_88 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
+ C_80 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
X_16:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",1);
- C_89 := algebra.thetasubselect(X_16,C_23,A3,"<");
- C_25 := sql.subdelta(C_87,C_23,C_13,C_88,C_89);
+ C_81 := algebra.thetasubselect(X_16,C_23,A3,"<");
+ C_25 := sql.subdelta(C_79,C_23,C_13,C_80,C_81);
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_90 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
+ C_82 := 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_91 := algebra.subselect(r1_46,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ C_83 := 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_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);
+ 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);
(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_83 := algebra.subselect(X_18,C_7,A1,A2,true,true,false);
+ C_75 := 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_84 := algebra.subselect(r1_23,nil:bat[:oid,:oid],A1,A2,true,true,false);
+ C_76 := 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_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_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_13,r1_13) := sql.bind(X_6,"sys","lineorder","lo_quantity",2);
- C_88 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
+ C_80 := algebra.thetasubselect(r1_13,nil:bat[:oid,:oid],A3,"<");
X_16:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",1);
- C_89 := algebra.thetasubselect(X_16,C_23,A3,"<");
- C_25 := sql.subdelta(C_87,C_23,C_13,C_88,C_89);
+ C_81 := algebra.thetasubselect(X_16,C_23,A3,"<");
+ C_25 := sql.subdelta(C_79,C_23,C_13,C_80,C_81);
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_90 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
+ C_82 := 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_91 := algebra.subselect(r1_46,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ C_83 := 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_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);
+ 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);
(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_83 := algebra.subselect(X_19,C_8,A1,A2,true,true,false);
+ C_75 := 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_84 := algebra.subselect(r1_25,nil:bat[:oid,:oid],A1,A2,true,true,false);
+ C_76 := 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_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_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_14,r1_14) := sql.bind(X_7,"sys","lineorder","lo_quantity",2);
- C_88 := algebra.subselect(r1_14,nil:bat[:oid,:oid],A3,A4,true,true,false);
+ C_80 := 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_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);
+ 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);
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_90 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
+ C_82 := 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_91 := algebra.subselect(r1_47,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ C_83 := 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_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);
+ 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);
(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_83 := algebra.subselect(X_19,C_8,A1,A2,true,true,false);
+ C_75 := 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_84 := algebra.subselect(r1_25,nil:bat[:oid,:oid],A1,A2,true,true,false);
+ C_76 := 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_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_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_14,r1_14) := sql.bind(X_7,"sys","lineorder","lo_quantity",2);
- C_88 := algebra.subselect(r1_14,nil:bat[:oid,:oid],A3,A4,true,true,false);
+ C_80 := 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_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);
+ 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);
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_90 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
+ C_82 := 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_91 := algebra.subselect(r1_47,nil:bat[:oid,:oid],A0,A0,true,false,false);
+ C_83 := 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_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);
+ 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);
(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
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{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_92 := algebra.subselect(X_20,C_9,A2,A3,true,true,false);
+ C_82 := 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_93 := algebra.subselect(r1_26,nil:bat[:oid,:oid],A2,A3,true,true,false);
+ C_83 := 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_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_85 := algebra.subselect(X_24,C_9,A2,A3,true,true,false);
+ C_25 := sql.subdelta(C_82,C_9,C_22,C_83,C_85);
+ C_86 := 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_97 := algebra.subselect(r1_15,nil:bat[:oid,:oid],A4,A5,true,true,false);
+ C_87 := 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_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);
+ C_88 := algebra.subselect(X_18,C_25,A4,A5,true,true,false);
+ C_27 := sql.subdelta(C_86,C_25,C_15,C_87,C_88);
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_99 := algebra.subselect(X_41,C_34,A1,A1,true,false,false);
+ C_89 := 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_100 :=
algebra.subselect(r1_56,nil:bat[:oid,:oid],A1,A1,true,false,false);
+ C_90 := 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_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_91 := algebra.subselect(X_45,C_34,A1,A1,true,false,false);
+ C_46 := sql.subdelta(C_89,C_34,C_43,C_90,C_91);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
