Changeset: f5489c26251a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f5489c26251a
Modified Files:
sql/storage/bat/bat_storage.c
Branch: Aug2024
Log Message:
Merge with Dec2023 branch.
diffs (29 lines):
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
@@ -333,11 +333,8 @@ segments2cs(sql_trans *tr, segments *seg
b->tnokey[1] = 0;
b->theap->dirty = true;
BUN cnt = BATcount(b);
- MT_lock_unset(&b->theaplock);
uint32_t *restrict dst;
- /* why hashlock ?? */
- MT_rwlock_wrlock(&b->thashlock);
for (; s ; s=ATOMIC_PTR_GET(&s->next)) {
if (s->start >= nr)
break;
@@ -404,12 +401,10 @@ segments2cs(sql_trans *tr, segments *seg
cnt = s->end;
}
}
- MT_rwlock_wrunlock(&b->thashlock);
if (nr > BATcount(b)) {
- MT_lock_set(&b->theaplock);
BATsetcount(b, nr);
- MT_lock_unset(&b->theaplock);
}
+ MT_lock_unset(&b->theaplock);
bat_destroy(b);
return LOG_OK;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
