Changeset: 27684bba3d70 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=27684bba3d70 Modified Files: clients/Tests/exports.stable.out gdk/ChangeLog gdk/gdk.h gdk/gdk_bat.c gdk/gdk_private.h Branch: default Log Message:
Removed unused functions BATmemsize and BATvmsize. diffs (80 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 @@ -146,7 +146,6 @@ gdk_return BATkey(BAT *b, int onoff); int BATkeyed(BAT *b); gdk_return BATleftjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, int nil_matches, BUN estimate) __attribute__((__warn_unused_result__)); void *BATmax(BAT *b, void *aggr); -size_t BATmemsize(BAT *b, int dirty); BAT *BATmergecand(BAT *a, BAT *b); void *BATmin(BAT *b, void *aggr); gdk_return BATmode(BAT *b, int onoff); diff --git a/gdk/ChangeLog b/gdk/ChangeLog --- a/gdk/ChangeLog +++ b/gdk/ChangeLog @@ -2,6 +2,7 @@ # This file is updated with Maddlog * Thu Jan 18 2018 Sjoerd Mullender <[email protected]> +- Removed unused functions BATmemsize and BATvmsize. - Removed the tnodense property: it was maintained but never actually used, not even stored. diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -1422,8 +1422,6 @@ gdk_export gdk_return BATgroup(BAT **gro gdk_export void BATmsync(BAT *b); -gdk_export size_t BATmemsize(BAT *b, int dirty); - #define NOFARM (-1) /* indicate to GDKfilepath to create relative path */ gdk_export char *GDKfilepath(int farmid, const char *dir, const char *nme, const char *ext); diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c --- a/gdk/gdk_bat.c +++ b/gdk/gdk_bat.c @@ -1391,30 +1391,6 @@ BATsetcount(BAT *b, BUN cnt) assert(b->batCapacity >= cnt); } -size_t -BATvmsize(BAT *b, int dirty) -{ - BATcheck(b, "BATvmsize", 0); - if (b->batDirty || (b->batPersistence != TRANSIENT && !b->batCopiedtodisk)) - dirty = 0; - return (!dirty || b->theap.dirty ? HEAPvmsize(&b->theap) : 0) + - ((!dirty || b->theap.dirty) && b->thash && b->thash != (Hash *) 1 ? HEAPvmsize(&b->thash->heap) : 0) + - (b->tvheap && (!dirty || b->tvheap->dirty) ? HEAPvmsize(b->tvheap) : 0); -} - -size_t -BATmemsize(BAT *b, int dirty) -{ - BATcheck(b, "BATmemsize", 0); - if (b->batDirty || - (b->batPersistence != TRANSIENT && !b->batCopiedtodisk)) - dirty = 0; - return (!dirty || b->batDirtydesc ? sizeof(BAT) : 0) + - (!dirty || b->theap.dirty ? HEAPmemsize(&b->theap) : 0) + - ((!dirty || b->theap.dirty) && b->thash && b->thash != (Hash *) 1 ? HEAPmemsize(&b->thash->heap) : 0) + - (b->tvheap && (!dirty || b->tvheap->dirty) ? HEAPmemsize(b->tvheap) : 0); -} - /* * The key and name properties can be changed at any time. Keyed * dimensions are automatically supported by an auxiliary hash-based diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h --- a/gdk/gdk_private.h +++ b/gdk/gdk_private.h @@ -70,8 +70,6 @@ enum heaptype { __attribute__((__visibility__("hidden"))); __hidden void BATsetdims(BAT *b) __attribute__((__visibility__("hidden"))); -__hidden size_t BATvmsize(BAT *b, int dirty) - __attribute__((__visibility__("hidden"))); __hidden gdk_return BBPcacheit(BAT *bn, int lock) __attribute__((__warn_unused_result__)) __attribute__((__visibility__("hidden"))); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
