Changeset: 56ce3abecee4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/56ce3abecee4
Modified Files:
gdk/gdk.h
gdk/gdk_heap.c
gdk/gdk_private.h
gdk/gdk_storage.c
Branch: Jul2021
Log Message:
Remove internal function HEAPdelete. It is subsumed by HEAPfree.
diffs (95 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -855,9 +855,6 @@ mskGetVal(BAT *b, BUN p)
* HEAPcopy (Heap *dst,*src);
* @item int
* @tab
- * HEAPdelete (Heap *dst, str o, str ext);
- * @item int
- * @tab
* HEAPwarm (Heap *h);
* @end multitable
*
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -894,27 +894,6 @@ HEAPsave(Heap *h, const char *nme, const
return HEAPsave_intern(h, nme, ext, ".new", dosync, free);
}
-/*
- * @- HEAPdelete
- * Delete any saved heap file. For memory mapped files, also try to
- * remove any remaining X.new
- */
-gdk_return
-HEAPdelete(Heap *h, const char *o, const char *ext)
-{
- char ext2[64];
-
- if (h->size <= 0) {
- assert(h->base == 0);
- return GDK_SUCCEED;
- }
- if (h->base)
- HEAPfree(h, false); /* we will do the unlinking */
- assert(strlen(ext) + strlen(".new") < sizeof(ext2));
- strconcat_len(ext2, sizeof(ext2), ext, ".new", NULL);
- return ((GDKunlink(h->farmid, BATDIR, o, ext) == GDK_SUCCEED) |
(GDKunlink(h->farmid, BATDIR, o, ext2) == GDK_SUCCEED)) ? GDK_SUCCEED :
GDK_FAIL;
-}
-
int
HEAPwarm(Heap *h)
{
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -199,8 +199,6 @@ gdk_return HEAPalloc(Heap *h, size_t nit
gdk_return HEAPcopy(Heap *dst, Heap *src, size_t offset)
__attribute__((__warn_unused_result__))
__attribute__((__visibility__("hidden")));
-gdk_return HEAPdelete(Heap *h, const char *o, const char *ext)
- __attribute__((__visibility__("hidden")));
void HEAPfree(Heap *h, bool remove)
__attribute__((__visibility__("hidden")));
gdk_return HEAPgrow(MT_Lock *lock, Heap **old, size_t size, bool mayshare)
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -985,7 +985,6 @@ void
BATdelete(BAT *b)
{
bat bid = b->batCacheid;
- const char *o = BBP_physical(bid);
BAT *loaded = BBP_cache(bid);
assert(bid > 0);
@@ -996,24 +995,9 @@ BATdelete(BAT *b)
IMPSdestroy(b);
OIDXdestroy(b);
PROPdestroy(b);
- if (b->batCopiedtodisk || (b->theap->storage != STORE_MEM)) {
- if (b->ttype != TYPE_void &&
- HEAPdelete(b->theap, o, gettailname(b)) != GDK_SUCCEED &&
- b->batCopiedtodisk)
- TRC_DEBUG(IO_, "BATdelete(%s): bun heap\n",
BATgetId(b));
- } else if (b->theap->base) {
- HEAPfree(b->theap, true);
- }
- if (b->tvheap) {
- assert(b->tvheap->parentid == bid);
- if (b->batCopiedtodisk || (b->tvheap->storage != STORE_MEM)) {
- if (HEAPdelete(b->tvheap, o, "theap") != GDK_SUCCEED &&
- b->batCopiedtodisk)
- TRC_DEBUG(IO_, "BATdelete(%s): tail heap\n",
BATgetId(b));
- } else {
- HEAPfree(b->tvheap, true);
- }
- }
+ HEAPfree(b->theap, true);
+ if (b->tvheap)
+ HEAPfree(b->tvheap, true);
b->batCopiedtodisk = false;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
