MonetDB: mosaic - Add lifecycle calls for mosaic indices.

[Aris Koning]

Changeset: d06c6417367f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d06c6417367f
Modified Files:
        gdk/gdk_align.c
        gdk/gdk_bat.c
        gdk/gdk_storage.c
Branch: mosaic
Log Message:

Add lifecycle calls for mosaic indices.


diffs (75 lines):

diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -176,6 +176,7 @@ BATmaterialize(BAT *b)
        /* cleanup possible ACC's */
        HASHdestroy(b);
        IMPSdestroy(b);
+       MOSdestroy(b);
        OIDXdestroy(b);
 
        snprintf(b->theap.filename, sizeof(b->theap.filename), "%s.tail", 
BBP_physical(b->batCacheid));
@@ -417,6 +418,7 @@ VIEWdestroy(BAT *b)
        /* remove any leftover private hash structures */
        HASHdestroy(b);
        IMPSdestroy(b);
+       MOSdestroy(b);
        OIDXdestroy(b);
        VIEWunlink(b);
 
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -464,8 +464,8 @@ BATextend(BAT *b, BUN newcap)
                return GDK_FAIL;
        HASHdestroy(b);
        IMPSdestroy(b);
+       MOSdestroy(b);
        OIDXdestroy(b);
-       MOSdestroy(b);
        return GDK_SUCCEED;
 }
 
@@ -496,6 +496,7 @@ BATclear(BAT *b, bool force)
        /* kill all search accelerators */
        HASHdestroy(b);
        IMPSdestroy(b);
+       MOSdestroy(b);
        OIDXdestroy(b);
        PROPdestroy(b);
 
@@ -1050,6 +1051,7 @@ BUNappend(BAT *b, const void *t, bool fo
 
 
        IMPSdestroy(b); /* no support for inserts in imprints yet */
+       MOSdestroy(b);
        OIDXdestroy(b);
        if (b->ttype != TYPE_void
            && ATOMlinear(b->ttype)
@@ -1157,6 +1159,7 @@ BUNdelete(BAT *b, oid o)
                }
        }
        IMPSdestroy(b);
+       MOSdestroy(b);
        OIDXdestroy(b);
        HASHdestroy(b);
 #if 0          /* enable if we have more properties than just min/max */
@@ -1261,6 +1264,7 @@ BUNinplace(BAT *b, BUN p, const void *t,
        }
        OIDXdestroy(b);
        IMPSdestroy(b);
+       MOSdestroy(b);
        if (b->tvarsized && b->ttype) {
                var_t _d;
                ptr _ptr;
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -873,6 +873,7 @@ BATdelete(BAT *b)
                b = loaded;
                HASHdestroy(b);
                IMPSdestroy(b);
+               MOSdestroy(b);
                OIDXdestroy(b);
        }
        if (b->batCopiedtodisk || (b->theap.storage != STORE_MEM)) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list