Changeset: 94f6efea3a1a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=94f6efea3a1a
Modified Files:
clients/Tests/exports.stable.out
clients/mapiclient/tomograph.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_pushselect.c
Branch: default
Log Message:
Removed unused bandjoinRef and thetajoinRef.
diffs (77 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
@@ -1957,7 +1957,6 @@ str arrayRef;
str assertRef;
str attachRef;
str avgRef;
-str bandjoinRef;
str basketRef;
void batAfterCall(ValPtr v, ValPtr bak);
void batBeforeCall(ValPtr v, ValPtr bak);
@@ -2536,7 +2535,6 @@ str subuniqueRef;
str sumRef;
str takeOid(oid id, str *val);
str takeRef;
-str thetajoinRef;
str thetasubselectRef;
str tidRef;
str timestampRef;
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -365,7 +365,6 @@ base_colors[NUM_COLORS] = {
/* 2 */ { 0, 0, "calc", "max", 0 },
/* 2 */ { 0, 0, "calc", "bit", 0 },
/* 2 */ { 0, 0, "calc", "*", 0 },
-/* 2 */ { 0, 0, "algebra", "thetajoin", 0 },
/* 2 */ { 0, 0, "algebra", "subthetajoin", 0 },
/* 1 */ { 0, 0, "sql", "dec_round", 0 },
/* 1 */ { 0, 0, "pqueue", "topn_min", 0 },
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
@@ -101,8 +101,6 @@ str ioRef;
str iteratorRef;
str joinPathRef;
str jsonRef;
-str bandjoinRef;
-str thetajoinRef;
str subjoinRef;
str subleftjoinRef;
str subantijoinRef;
@@ -315,8 +313,6 @@ void optimizerInit(void)
ioRef = putName("io",2);
iteratorRef = putName("iterator",8);
joinPathRef = putName("joinPath",8);
- bandjoinRef = putName("bandjoin",8);
- thetajoinRef = putName("thetajoin",9);
subjoinRef = putName("subjoin",7);
subleftjoinRef = putName("subleftjoin",11);
subantijoinRef = putName("subantijoin",11);
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
@@ -99,8 +99,6 @@ opt_export str ioRef;
opt_export str iteratorRef;
opt_export str joinPathRef;
opt_export str jsonRef;
-opt_export str bandjoinRef;
-opt_export str thetajoinRef;
opt_export str subjoinRef;
opt_export str subleftjoinRef;
opt_export str subantijoinRef;
diff --git a/monetdb5/optimizer/opt_pushselect.c
b/monetdb5/optimizer/opt_pushselect.c
--- a/monetdb5/optimizer/opt_pushselect.c
+++ b/monetdb5/optimizer/opt_pushselect.c
@@ -377,10 +377,6 @@ OPTpushselectImplementation(Client cntxt
p = pushBit(mb, p, FALSE); /* do not match nils
*/
p = pushNil(mb, p, TYPE_lng); /* no estimate */
- if(getFunctionId(p) == thetajoinRef)
- getFunctionId(p) = subthetajoinRef;
- else if(getFunctionId(p) == bandjoinRef)
- getFunctionId(p) = subbandjoinRef;
/* make sure to resolve again */
p->token = ASSIGNsymbol;
p->typechk = TYPE_UNKNOWN;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
