Changeset: 24cbc7171c7a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/24cbc7171c7a
Modified Files:
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_delta.c
gdk/gdk_storage.c
Branch: Jul2021
Log Message:
Do not use batDirtyflushed bit.
diffs (53 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -758,7 +758,7 @@ typedef struct BAT {
MT_Id creator_tid; /* which thread created it */
bool
batCopiedtodisk:1, /* once written */
- batDirtyflushed:1, /* was dirty before commit started? */
+ batDirtyflushed:1, /* was dirty before commit started? (not used)
*/
batDirtydesc:1, /* bat descriptor dirty marker (not used) */
batTransient:1; /* should the BAT persist on disk? */
uint8_t /* adjacent bit fields are packed together (if they fit) */
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2512,6 +2512,7 @@ BATassertProps(BAT *b)
/* general BAT sanity */
assert(b != NULL);
assert(!b->batDirtydesc); /* not used anymore, must always be false */
+ assert(!b->batDirtyflushed); /* not used anymore, must always be false
*/
assert(b->batCacheid > 0);
assert(b->batCount >= b->batInserted);
diff --git a/gdk/gdk_delta.c b/gdk/gdk_delta.c
--- a/gdk/gdk_delta.c
+++ b/gdk/gdk_delta.c
@@ -37,9 +37,6 @@ BATcommit(BAT *b, BUN size)
return;
TRC_DEBUG(DELTA, "BATcommit1 %s free %zu ins " BUNFMT " base %p\n",
BATgetId(b), b->theap->free, b->batInserted, b->theap->base);
- if (!BATdirty(b)) {
- b->batDirtyflushed = false;
- }
b->batInserted = size < BUNlast(b) ? size : BUNlast(b);
TRC_DEBUG(DELTA, "BATcommit2 %s free %zu ins " BUNFMT " base %p\n",
BATgetId(b), b->theap->free, b->batInserted, b->theap->base);
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -839,13 +839,11 @@ BATsave_locked(BAT *b, BATiter *bi, BUN
if (size != b->batCount || b->batInserted < b->batCount) {
/* if the sizes don't match, the BAT must be dirty */
b->batCopiedtodisk = false;
- b->batDirtyflushed = true;
b->theap->dirty = true;
if (b->tvheap)
b->tvheap->dirty = true;
} else {
b->batCopiedtodisk = true;
- b->batDirtyflushed = DELTAdirty(b);
}
MT_lock_unset(&b->theaplock);
if (b->thash && b->thash != (Hash *) 1)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
