Changeset: 68b2bba04187 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=68b2bba04187 Modified Files: clients/Tests/exports.stable.out gdk/ChangeLog gdk/gdk.h gdk/gdk_delta.c Branch: default Log Message:
Removed unused functions BATalpha, BATdelta, and BATprev. diffs (181 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 @@ -18,7 +18,6 @@ int ATOMlen(int id, const void *v); str ATOMname(int id); ptr ATOMnil(int id); int ATOMprint(int id, const void *val, stream *fd); -BAT *BATalpha(BAT *b); gdk_return BATappend(BAT *b, BAT *c, bit force); void BATassertProps(BAT *b); atomDesc BATatoms[]; @@ -107,7 +106,6 @@ BAT *BATconst(BAT *l, int tt, const void BAT *BATconstant(int tt, const void *val, BUN cnt, int role); BAT *BATconvert(BAT *b, BAT *s, int tp, int abort_on_error); BUN BATcount_no_nil(BAT *b); -BAT *BATdelta(BAT *b); BAT *BATdense(oid hseq, oid tseq, BUN cnt) __attribute__((warn_unused_result)); void BATderiveHeadProps(BAT *b, int expensive); void BATderiveProps(BAT *b, int expensive); @@ -151,7 +149,6 @@ BAT *BATnew(int hdtype, int tltype, BUN int BATordered(BAT *b); int BATordered_rev(BAT *b); gdk_return BATouterjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, int nil_matches, BUN estimate); -BAT *BATprev(BAT *b); gdk_return BATprint(BAT *b); gdk_return BATprintcolumns(stream *s, int argc, BAT *argv[]); gdk_return BATprintf(stream *f, BAT *b); diff --git a/gdk/ChangeLog b/gdk/ChangeLog --- a/gdk/ChangeLog +++ b/gdk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog +* Thu Dec 17 2015 Sjoerd Mullender <[email protected]> +- Removed unused functions BATalpha, BATdelta, and BATprev. + * Mon Dec 14 2015 Sjoerd Mullender <[email protected]> - Removed functions BATins, BATdel, BUNdel and BUNdelete. diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -2621,12 +2621,6 @@ gdk_export gdk_return TMsubcommit_list(b * @tab BATfakeCommit (BAT *b) * @item BAT * * @tab BATundo (BAT *b) - * @item BAT * - * @tab BATprev (BAT *b) - * @item BAT * - * @tab BATalpha (BAT *b) - * @item BAT * - * @tab BATdelta (BAT *b) * @end multitable * * The BAT keeps track of updates with respect to a 'previous state'. @@ -2653,22 +2647,10 @@ gdk_export gdk_return TMsubcommit_list(b * BUG: after a failed TMcommit, TMabort does not do anything because * TMcommit does the BATcommits @emph{before} attempting to sync to * disk instead of @sc{after} doing this. - * - * The previous state can also be queried. BATprev is a view on the - * current BAT as it was in the previous state. BATalpha shows only - * the BUNs inserted since the previous state, and BATdelta the - * deleted buns. - * - * CAVEAT: BATprev, BATalpha and BATdelta only return views if the - * underlying BATs are read-only (often not the case when BATs are - * being updated). Otherwise, copies must be made anyway. */ gdk_export void BATcommit(BAT *b); gdk_export void BATfakeCommit(BAT *b); gdk_export void BATundo(BAT *b); -gdk_export BAT *BATalpha(BAT *b); -gdk_export BAT *BATdelta(BAT *b); -gdk_export BAT *BATprev(BAT *b); /* * @+ BAT Alignment and BAT views diff --git a/gdk/gdk_delta.c b/gdk/gdk_delta.c --- a/gdk/gdk_delta.c +++ b/gdk/gdk_delta.c @@ -199,98 +199,3 @@ BATundo(BAT *b) b->batFirst = b->batDeleted; BATsetcount(b, b->batInserted); } - -/* - * The proposed modifications can be obtained through the @%BATalpha@ - * and @%BATdelta@ routines , which return the inserted and deleted - * BUNs, respectively. - */ -BAT * -BATprev(BAT *b) -{ - BUN p; - BAT *bn; - BATiter bi = bat_iterator(b); - - BATcheck(b, "BATprev", NULL); - if (b->batRestricted == BAT_READ) { - bn = VIEWcreate(b->hseqbase, b); - if (bn) { - bn->batCount = bn->batInserted - bn->batDeleted; - bn->batInserted = bn->batFirst = bn->batDeleted; - } - return bn; - } - assert(BAThtype(b)== TYPE_void); // headless guard - bn = BATnew(TYPE_void, BATttype(b), BATcapacity(b), TRANSIENT); - if (bn == NULL) { - return bn; - } - for (p = b->batDeleted; p < b->batInserted; p++) { - if (BUNappend(bn, BUNtail(bi, p), FALSE) != GDK_SUCCEED) { - BBPreclaim(bn); - return NULL; - } - } - return bn; -} - -BAT * -BATalpha(BAT *b) -{ - BUN p; - BAT *bn; - BATiter bi = bat_iterator(b); - - BATcheck(b, "BATalpha", NULL); - if (b->batRestricted == BAT_READ) { - bn = VIEWcreate(b->hseqbase, b); - if (bn) { - bn->batCount -= (bn->batInserted - bn->batFirst); - bn->batDeleted = bn->batFirst = bn->batInserted; - } - return bn; - } - assert(BAThtype(b) == TYPE_void); //headless guard - bn = BATnew(TYPE_void, BATttype(b), BATcapacity(b), TRANSIENT); - if (bn == NULL) { - return bn; - } - for (p = b->batInserted; p < BUNlast(b); p++) { - if (BUNappend(bn, BUNtail(bi, p), FALSE) != GDK_SUCCEED) { - BBPreclaim(bn); - return NULL; - } - } - return bn; -} - -BAT * -BATdelta(BAT *b) -{ - BUN p; - BAT *bn; - BATiter bi = bat_iterator(b); - - BATcheck(b, "BATdelta", NULL); - if (b->batRestricted == BAT_READ) { - bn = VIEWcreate(b->hseqbase, b); - if (bn) { - bn->batCount = bn->batFirst - bn->batDeleted; - bn->batFirst = bn->batInserted = bn->batDeleted; - } - return bn; - } - assert(BAThtype(b)== TYPE_void); - bn = BATnew(TYPE_void, BATttype(b), BATcapacity(b), TRANSIENT); - if (bn == NULL) { - return bn; - } - for (p = b->batDeleted; p < b->batFirst; p++) { - if (BUNappend(bn, BUNtail(bi, p), FALSE) != GDK_SUCCEED) { - BBPreclaim(bn); - return NULL; - } - } - return bn; -} _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
