Changeset: 63a757e22c91 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=63a757e22c91 Modified Files: sql/storage/bat/bat_storage.c sql/storage/store.c Branch: nospare Log Message:
small cleanup (ie delay setting ts) diffs (40 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 @@ -1897,7 +1897,7 @@ log_destroy_del(sql_trans *tr, sql_chang sql_table *t = (sql_table*)change->obj; assert(!isTempTable(t)); sql_dbat *dbat = t->data; - assert(dbat->ts == tr->tid || (t->base.ts == commit_ts && commit_ts == oldest)); + assert(dbat->ts == tr->tid || t->base.ts == tr->tid || (t->base.ts == commit_ts && commit_ts == oldest)); dbat->ts = commit_ts; ok = log_destroy_dbat(tr, t->data, t->bootstrap?0:LOG_TAB, t->base.id); diff --git a/sql/storage/store.c b/sql/storage/store.c --- a/sql/storage/store.c +++ b/sql/storage/store.c @@ -256,11 +256,11 @@ tc_log_table(sql_trans *tr, sql_change * sql_table *t = (sql_table*)change->obj; sqlstore *store = tr->store; + change->obj->ts = commit_ts; if (isTable(t) && !isTempTable(t)) { if (t->base.deleted) { ok = store->storage_api.log_destroy_del(tr, change, commit_ts, oldest); } else { /* new table ? */ - change->obj->ts = commit_ts; ok = store->storage_api.log_create_del(tr, change, commit_ts, oldest); if (ok == LOG_OK) return tc_commit_table_(tr, t, commit_ts, oldest); @@ -3434,9 +3434,10 @@ sql_trans_commit(sql_trans *tr) for(node *n=tr->changes->h; n && ok == LOG_OK; n = n->next) { sql_change *c = n->data; - c->obj->ts = commit_ts; if (c->log && ok == LOG_OK) ok = c->log(tr, c, commit_ts, oldest); + else + c->obj->ts = commit_ts; } if (ok == LOG_OK && store->prev_oid != store->obj_id) ok = store->logger_api.log_sequence(store, OBJ_SID, store->obj_id); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list