Changeset: 8a39fbc20b67 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8a39fbc20b67
Modified Files:
gdk/gdk_batop.c
monetdb5/modules/atoms/batxml.c
sql/storage/bat/bat_storage.c
Branch: Jul2021
Log Message:
Set dirty bit, or don't set when it's already done.
diffs (49 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -964,6 +964,7 @@ BATdel(BAT *b, BAT *d)
Tloc(b, o + c),
Tsize(b) * (BATcount(b) - (o + c)));
}
+ b->theap->dirty = true;
// o += b->hseqbase; // if this were to be used again
}
MT_lock_set(&b->theaplock);
@@ -1037,6 +1038,7 @@ BATdel(BAT *b, BAT *d)
}
bat_iterator_end(&di);
MT_lock_set(&b->theaplock);
+ b->theap->dirty = true;
b->batCount -= nd;
MT_lock_unset(&b->theaplock);
}
diff --git a/monetdb5/modules/atoms/batxml.c b/monetdb5/modules/atoms/batxml.c
--- a/monetdb5/modules/atoms/batxml.c
+++ b/monetdb5/modules/atoms/batxml.c
@@ -53,7 +53,6 @@
#define finalizeResult(X,Y,Z) \
do {
\
BATsetcount((Y), (Y)->batCount); \
- (Y)->theap->dirty |= (Y)->batCount > 0; \
*(X) = (Y)->batCacheid; \
BBPkeepref(*(X));
\
BBPunfix((Z)->batCacheid); \
@@ -1042,7 +1041,6 @@ BATXMLforest(Client cntxt, MalBlkPtr mb,
}
GDKfree(buf);
BATsetcount(bn, bn->batCount);
- bn->theap->dirty |= bn->batCount > 0;
*ret = bn->batCacheid;
BBPkeepref(*ret);
for (i = pci->retc; i < pci->argc; i++) {
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -3660,6 +3660,7 @@ add_offsets(BUN slot, size_t nr, size_t
for(size_t i = 0; i < nr; i++)
dst[i] = slot + i;
(*offsets)->batCount += nr;
+ (*offsets)->theap->dirty = true;
return LOG_OK;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
