MonetDB: Jun2020 - Destroy index files when a BAT is destroyed.

[Sjoerd Mullender]

Changeset: c174d01fcc3f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c174d01fcc3f
Modified Files:
        gdk/gdk_hash.c
        gdk/gdk_storage.c
Branch: Jun2020
Log Message:

Destroy index files when a BAT is destroyed.
This should fix bug 6863.


diffs (33 lines):

diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -107,7 +107,11 @@ doHASHdestroy(BAT *b, Hash *hs)
                GDKunlink(BBPselectfarm(b->batRole, b->ttype, hashheap),
                          BATDIR,
                          BBP_physical(b->batCacheid),
-                         "thash");
+                         "thashl");
+               GDKunlink(BBPselectfarm(b->batRole, b->ttype, hashheap),
+                         BATDIR,
+                         BBP_physical(b->batCacheid),
+                         "thashb");
        } else if (hs) {
                bat p = VIEWtparent(b);
                BAT *hp = NULL;
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -887,10 +887,10 @@ BATdelete(BAT *b)
        assert(bid > 0);
        if (loaded) {
                b = loaded;
-               HASHdestroy(b);
-               IMPSdestroy(b);
-               OIDXdestroy(b);
        }
+       HASHdestroy(b);
+       IMPSdestroy(b);
+       OIDXdestroy(b);
        if (b->batCopiedtodisk || (b->theap.storage != STORE_MEM)) {
                if (b->ttype != TYPE_void &&
                    HEAPdelete(&b->theap, o, "tail") != GDK_SUCCEED &&
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list