Changeset: 2b7c8ac0e008 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2b7c8ac0e008 Modified Files: gdk/gdk_bat.c gdk/gdk_batop.c Branch: leftmart Log Message:
make sure that we destroy order idx when necessary diffs (46 lines): diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c --- a/gdk/gdk_bat.c +++ b/gdk/gdk_bat.c @@ -417,6 +417,7 @@ BATextend(BAT *b, BUN newcap) return GDK_FAIL; HASHdestroy(b); IMPSdestroy(b); + OIDXdestroy(b); return GDK_SUCCEED; } @@ -443,6 +444,7 @@ BATclear(BAT *b, int force) /* kill all search accelerators */ HASHdestroy(b); IMPSdestroy(b); + OIDXdestroy(b); /* we must dispose of all inserted atoms */ if ((b->batDeleted == b->batInserted || force) && @@ -1071,6 +1073,7 @@ BUNappend(BAT *b, const void *t, bit for IMPSdestroy(b); /* no support for inserts in imprints yet */ + OIDXdestroy(b); /* first adapt the hashes; then the user-defined accelerators. * REASON: some accelerator updates (qsignature) use the hashes! @@ -1133,6 +1136,7 @@ BUNdelete(BAT *b, oid o) } } IMPSdestroy(b); + OIDXdestroy(b); HASHdestroy(b); return GDK_SUCCEED; } diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c --- a/gdk/gdk_batop.c +++ b/gdk/gdk_batop.c @@ -424,6 +424,7 @@ BATappend(BAT *b, BAT *n, bit force) } IMPSdestroy(b); /* imprints do not support updates yet */ + OIDXdestroy(b); /* append two void,void bats */ if (b->ttype == TYPE_void && BATtdense(b)) { _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list