Changeset: 4bdcafc26a92 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4bdcafc26a92 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out monetdb5/ChangeLog monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_pushselect.c Branch: default Log Message:
Removed algebra.antijoin. diffs (176 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -2254,10 +2254,6 @@ command aggr.variance(b:bat[:oid,:any_2] address ALGvariance; comment Gives the variance of all tail values -command algebra.antijoin(left:bat[:oid,:any_1],right:bat[:oid,:any_1]) (l:bat[:oid,:oid],r:bat[:oid,:oid]) -address ALGantijoin2; -comment Returns 2 columns with all BUNs, consisting of the head-oids from 'left' and 'right' for which there are BUNs in 'left' and 'right' with equal tails - command algebra.crossproduct(left:bat[:oid,:any_1],right:bat[:oid,:any_2]) (l:bat[:oid,:oid],r:bat[:oid,:oid]) address ALGcrossproduct2; comment Returns 2 columns with all BUNs, consisting of the head-oids from 'left' and 'right' for which there are BUNs in 'left' and 'right' with equal tails diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -2765,10 +2765,6 @@ command aggr.variance(b:bat[:oid,:any_2] address ALGvariance; comment Gives the variance of all tail values -command algebra.antijoin(left:bat[:oid,:any_1],right:bat[:oid,:any_1]) (l:bat[:oid,:oid],r:bat[:oid,:oid]) -address ALGantijoin2; -comment Returns 2 columns with all BUNs, consisting of the head-oids from 'left' and 'right' for which there are BUNs in 'left' and 'right' with equal tails - command algebra.crossproduct(left:bat[:oid,:any_1],right:bat[:oid,:any_2]) (l:bat[:oid,:oid],r:bat[:oid,:oid]) address ALGcrossproduct2; comment Returns 2 columns with all BUNs, consisting of the head-oids from 'left' and 'right' for which there are BUNs in 'left' and 'right' with equal tails 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 @@ -692,7 +692,6 @@ str ALARMsleep(void *res, int *secs); str ALARMtime(int *res); str ALARMtimers(bat *res, bat *actions); str ALARMusec(lng *ret); -str ALGantijoin2(bat *l, bat *r, const bat *lid, const bat *rid); str ALGcard(lng *result, const bat *bid); str ALGcopy(bat *result, const bat *bid); str ALGcount_bat(wrd *result, const bat *bid); @@ -1954,7 +1953,6 @@ str affectedRowsRef; str aggrRef; str alarmRef; str algebraRef; -str antijoinRef; str appendRef; str appendidxRef; str arrayRef; diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog --- a/monetdb5/ChangeLog +++ b/monetdb5/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog +* Thu Dec 3 2015 Sjoerd Mullender <[email protected]> +- Removed algebra.antijoin. Use algebra.subantijoin or + algebra.subthetajoin instead. + * Mon Nov 23 2015 Martin Kersten <[email protected]> - The MAL function 'leftfetchjoin' is renamed to its relational algebra version 'projection' diff --git a/monetdb5/modules/kernel/algebra.c b/monetdb5/modules/kernel/algebra.c --- a/monetdb5/modules/kernel/algebra.c +++ b/monetdb5/modules/kernel/algebra.c @@ -669,34 +669,6 @@ ALGsubunique1(bat *result, const bat *bi } str -ALGantijoin2( bat *l, bat *r, const bat *left, const bat *right) -{ - BAT *L, *R, *j1, *j2; - gdk_return ret; - - if ((L = BATdescriptor(*left)) == NULL) { - throw(MAL, "algebra.antijoin", RUNTIME_OBJECT_MISSING); - } - if ((R = BATdescriptor(*right)) == NULL) { - BBPunfix(L->batCacheid); - throw(MAL, "algebra.antijoin", RUNTIME_OBJECT_MISSING); - } - - ret = BATthetajoin(&j1, &j2, L, R, NULL, NULL, JOIN_NE, 0, BUN_NONE); - BBPunfix(L->batCacheid); - BBPunfix(R->batCacheid); - if (ret != GDK_SUCCEED) - throw(MAL, "algebra.antijoin", GDK_EXCEPTION); - if (!(j1->batDirty&2)) - BATsetaccess(j1, BAT_READ); - if (!(j2->batDirty&2)) - BATsetaccess(j2, BAT_READ); - BBPkeepref(*l = j1->batCacheid); - BBPkeepref(*r = j2->batCacheid); - return MAL_SUCCEED; -} - -str ALGjoin2( bat *l, bat *r, const bat *left, const bat *right) { BAT *L, *R, *j1, *j2; diff --git a/monetdb5/modules/kernel/algebra.h b/monetdb5/modules/kernel/algebra.h --- a/monetdb5/modules/kernel/algebra.h +++ b/monetdb5/modules/kernel/algebra.h @@ -48,7 +48,6 @@ algebra_export str ALGsubdiff(bat *r1, c algebra_export str ALGsubinter(bat *r1, const bat *lid, const bat *rid, const bat *slid, const bat *srid, const bit *nil_matches, const lng *estimate); /* legacy join functions */ -algebra_export str ALGantijoin2(bat *l, bat *r, const bat *lid, const bat *rid); algebra_export str ALGjoin2(bat *l, bat *r, const bat *lid, const bat *rid); algebra_export str ALGcrossproduct2(bat *l, bat *r, const bat *lid, const bat *rid); algebra_export str ALGrangejoin2(bat *l, bat *r, const bat *lid, const bat *rlid, const bat *rhid, const bit *li, const bit *hi); diff --git a/monetdb5/modules/kernel/algebra.mal b/monetdb5/modules/kernel/algebra.mal --- a/monetdb5/modules/kernel/algebra.mal +++ b/monetdb5/modules/kernel/algebra.mal @@ -176,12 +176,6 @@ comment "Select all unique values from t # @+ Join operations # The core of every relational engine. # The join collection provided by the GDK kernel. -command antijoin( left:bat[:oid,:any_1], right:bat[:oid,:any_1]) (l:bat[:oid,:oid],r:bat[:oid,:oid]) -address ALGantijoin2 -comment "Returns 2 columns with all BUNs, consisting of the head-oids - from 'left' and 'right' for which there are BUNs in 'left' - and 'right' with equal tails"; - command join( left:bat[:oid,:any_1], right:bat[:oid,:any_1]) (l:bat[:oid,:oid],r:bat[:oid,:oid]) address ALGjoin2 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 @@ -102,7 +102,6 @@ str iteratorRef; str joinPathRef; str jsonRef; str joinRef; -str antijoinRef; str bandjoinRef; str thetajoinRef; str subjoinRef; @@ -318,7 +317,6 @@ void optimizerInit(void) iteratorRef = putName("iterator",8); joinPathRef = putName("joinPath",8); joinRef = putName("join",4); - antijoinRef = putName("antijoin",8); bandjoinRef = putName("bandjoin",8); thetajoinRef = putName("thetajoin",9); subjoinRef = putName("subjoin",7); 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 @@ -100,7 +100,6 @@ opt_export str iteratorRef; opt_export str joinPathRef; opt_export str jsonRef; opt_export str joinRef; -opt_export str antijoinRef; opt_export str bandjoinRef; opt_export str thetajoinRef; opt_export str subjoinRef; 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 @@ -378,16 +378,12 @@ OPTpushselectImplementation(Client cntxt done = 1; } if (done) { - if(getFunctionId(p) == antijoinRef) - p = pushInt(mb, p, JOIN_NE); p = pushBit(mb, p, FALSE); /* do not match nils */ p = pushNil(mb, p, TYPE_lng); /* no estimate */ /* TODO join* -> subjoin* */ if(getFunctionId(p) == joinRef) getFunctionId(p) = subjoinRef; - else if(getFunctionId(p) == antijoinRef) - getFunctionId(p) = subthetajoinRef; else if(getFunctionId(p) == thetajoinRef) getFunctionId(p) = subthetajoinRef; else if(getFunctionId(p) == bandjoinRef) _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
