Changeset: e6df5d0ce2d0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e6df5d0ce2d0
Modified Files:
gdk/gdk_storage.c
Branch: Jan2022
Log Message:
Merge with Jul2021 branch.
diffs (23 lines):
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -974,7 +974,8 @@ BATdelete(BAT *b)
STRMPdestroy(b);
if (b->theap) {
HEAPfree(b->theap, true);
- if ((f = GDKfilepath(b->theap->farmid, BAKDIR, o, "tail1")) !=
NULL) {
+ if (!GDKinmemory(b->theap->farmid) &&
+ (f = GDKfilepath(b->theap->farmid, BAKDIR, o, "tail1")) !=
NULL) {
MT_remove(f);
size_t i = strlen(f) - 1;
f[i] = '2';
@@ -990,7 +991,8 @@ BATdelete(BAT *b)
}
if (b->tvheap) {
HEAPfree(b->tvheap, true);
- if ((f = GDKfilepath(b->theap->farmid, BAKDIR, o, "theap")) !=
NULL) {
+ if (!GDKinmemory(b->tvheap->farmid) &&
+ (f = GDKfilepath(b->theap->farmid, BAKDIR, o, "theap")) !=
NULL) {
MT_remove(f);
GDKfree(f);
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
