Changeset: 8ff61ff9c2eb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8ff61ff9c2eb
Modified Files:
sql/storage/bat/bat_storage.c
sql/storage/store.c
Branch: Jan2022
Log Message:
fixed issue with clear flag not being zapped causing the next appends not to be
logged into the WAL.
diffs (34 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
@@ -4276,7 +4276,6 @@ commit_update_del( sql_trans *tr, sql_ch
} else
rollback_segments(dbat->segs, tr, change, oldest);
} else if (ok == LOG_OK && !tr->parent) {
- storage *d = dbat;
if (dbat->cs.ts == tr->tid) /* cleared table */
dbat->cs.ts = commit_ts;
@@ -4284,8 +4283,10 @@ commit_update_del( sql_trans *tr, sql_ch
assert(ok == LOG_OK);
if (ok == LOG_OK)
merge_segments(dbat, tr, change, commit_ts, oldest);
- if (ok == LOG_OK && dbat == d && oldest == commit_ts)
+ if (ok == LOG_OK && oldest == commit_ts)
ok = merge_storage(dbat);
+ if (dbat)
+ dbat->cs.cleared = false;
} else if (ok == LOG_OK && tr->parent) {/* cleanup older save points */
merge_segments(dbat, tr, change, commit_ts, oldest);
ATOMIC_PTR_SET(&t->data, savepoint_commit_storage(dbat,
commit_ts));
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1352,6 +1352,7 @@ next_oid(sqlstore *store)
sqlid id = 0;
MT_lock_set(&store->lock);
id = store->obj_id++;
+ assert(id < 2000000000);
MT_lock_unset(&store->lock);
return id;
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
