Changeset: 50efdee15ef9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=50efdee15ef9 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/modules/kernel/bat5.c monetdb5/modules/kernel/bat5.h Branch: default Log Message:
Removed algebra.revert with its implementation ALGrevert. Also removed unused BKCrevert. diffs (149 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 @@ -2382,10 +2382,6 @@ command algebra.reuse(b:bat[:oid,:any_1] address ALGreuse; comment Reuse a temporary BAT if you can. Otherwise, allocate enough storage to accept result of an operation (not involving the heap) -command algebra.revert(b:bat[:oid,:any_1]):bat[:oid,:any_1] -address ALGrevert; -comment Returns a BAT copy with buns in reverse order - pattern algebra.semijoinPath(l:bat[:any,:any]...):bat[:any,:any] address ALGjoinPath; comment Routine to handle join paths. The type analysis is rather tricky. 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 @@ -2893,10 +2893,6 @@ command algebra.reuse(b:bat[:oid,:any_1] address ALGreuse; comment Reuse a temporary BAT if you can. Otherwise, allocate enough storage to accept result of an operation (not involving the heap) -command algebra.revert(b:bat[:oid,:any_1]):bat[:oid,:any_1] -address ALGrevert; -comment Returns a BAT copy with buns in reverse order - pattern algebra.semijoinPath(l:bat[:any,:any]...):bat[:any,:any] address ALGjoinPath; comment Routine to handle join paths. The type analysis is rather tricky. 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 @@ -748,7 +748,6 @@ str ALGprojecttail(Client cntxt, MalBlkP str ALGrangejoin(bat *result, const bat *lid, const bat *rlid, const bat *rhid, const bit *li, const bit *hi); str ALGrangejoin2(bat *l, bat *r, const bat *lid, const bat *rlid, const bat *rhid, const bit *li, const bit *hi); str ALGreuse(bat *ret, const bat *bid); -str ALGrevert(bat *result, const bat *bid); str ALGsample(bat *result, const bat *bid, const int *param); str ALGselect(bat *result, const bat *bid, ptr low, ptr high); str ALGselect1(bat *result, const bat *bid, ptr value); @@ -874,7 +873,6 @@ str BKCpersists(void *r, const bat *bid, str BKCreuseBAT(bat *ret, const bat *bid, const bat *did); str BKCreuseBATmap(bat *ret, const bat *bid, const bat *did); str BKCreverse(bat *ret, const bat *bid); -str BKCrevert(bat *ret, const bat *bid); str BKCsave(bit *res, const char *const *input); str BKCsave2(void *r, const bat *bid); str BKCsetAccess(bat *res, const bat *bid, const char *const *param); diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog --- a/monetdb5/ChangeLog +++ b/monetdb5/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog +* Wed Sep 9 2015 Sjoerd Mullender <[email protected]> +- Removed algebra.revert. + * Tue Sep 8 2015 Sjoerd Mullender <[email protected]> - Removed bat.order and bat.orderReverse functions. 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 @@ -1349,22 +1349,6 @@ ALGsubsort11(bat *result, const bat *bid } str -ALGrevert(bat *result, const bat *bid) -{ - BAT *b, *bn; - - if ((b = BATdescriptor(*bid)) == NULL) { - throw(MAL, "algebra.revert", RUNTIME_OBJECT_MISSING); - } - bn = BATcopy(b, b->htype, b->ttype, TRUE, TRANSIENT); - BATrevert(bn); - *result= bn->batCacheid; - BBPkeepref(bn->batCacheid); - BBPunfix(b->batCacheid); - return MAL_SUCCEED; -} - -str ALGcount_bat(wrd *result, const bat *bid) { BAT *b; 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 @@ -92,7 +92,6 @@ algebra_export str ALGsubsort23(bat *res algebra_export str ALGsubsort31(bat *result, const bat *bid, const bat *order, const bat *group, const bit *reverse, const bit *stable); algebra_export str ALGsubsort32(bat *result, bat *norder, const bat *bid, const bat *order, const bat *group, const bit *reverse, const bit *stable); algebra_export str ALGsubsort33(bat *result, bat *norder, bat *ngroup, const bat *bid, const bat *order, const bat *group, const bit *reverse, const bit *stable); -algebra_export str ALGrevert(bat *result, const bat *bid); algebra_export str ALGcount_bat(wrd *result, const bat *bid); algebra_export str ALGcount_nil(wrd *result, const bat *bid, const bit *ignore_nils); algebra_export str ALGcount_no_nil(wrd *result, const bat *bid); 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 @@ -32,10 +32,6 @@ command leftfetchjoin ( left:bat[:oid,:o address ALGleftfetchjoin comment "Hook directly into the left fetch join implementation."; -command revert( b:bat[:oid,:any_1]) :bat[:oid,:any_1] -address ALGrevert -comment "Returns a BAT copy with buns in reverse order"; - # BAT copying command copy( b:bat[:oid,:any_1]) :bat[:oid,:any_1] address ALGcopy diff --git a/monetdb5/modules/kernel/bat5.c b/monetdb5/modules/kernel/bat5.c --- a/monetdb5/modules/kernel/bat5.c +++ b/monetdb5/modules/kernel/bat5.c @@ -483,23 +483,6 @@ BKCmirror(bat *ret, const bat *bid) } str -BKCrevert(bat *r, const bat *bid) -{ - BAT *b; - - if ((b = BATdescriptor(*bid)) == NULL) - throw(MAL, "bat.revert", RUNTIME_OBJECT_MISSING); - if ((b = setaccess(b, BAT_WRITE)) == NULL) - throw(MAL, "bat.revert", OPERATION_FAILED); - if (BATrevert(b) != GDK_SUCCEED) { - BBPunfix(b->batCacheid); - throw(MAL, "bat.revert", GDK_EXCEPTION); - } - BBPkeepref(*r = b->batCacheid); - return MAL_SUCCEED; -} - -str BKCinsert_bat(bat *r, const bat *bid, const bat *sid) { BAT *b, *s; diff --git a/monetdb5/modules/kernel/bat5.h b/monetdb5/modules/kernel/bat5.h --- a/monetdb5/modules/kernel/bat5.h +++ b/monetdb5/modules/kernel/bat5.h @@ -30,7 +30,6 @@ bat5_export str BKCattach(bat *ret, cons bat5_export str BKCdensebat(bat *ret, const wrd *size); bat5_export str BKCreverse(bat *ret, const bat *bid); bat5_export str BKCmirror(bat *ret, const bat *bid); -bat5_export str BKCrevert(bat *ret, const bat *bid); bat5_export str BKCinsert_bat(bat *r, const bat *bid, const bat *sid); bat5_export str BKCinsert_bat_force(bat *r, const bat *bid, const bat *sid, const bit *force); bat5_export str BKCdelete_all(bat *r, const bat *bid); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
