Changeset: b201ca077132 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b201ca077132
Modified Files:
sql/storage/bat/bat_storage.c
Branch: Jul2021
Log Message:
small cleanup
diffs (35 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
@@ -1547,14 +1547,13 @@ static int
append_col(sql_trans *tr, sql_column *c, void *offset, void *i, int tpe)
{
sql_delta *delta, *odelta = ATOMIC_PTR_GET(&c->data);
- int in_transaction = segments_in_transaction(tr, c->t);
if ((delta = bind_col_data(tr, c, NULL)) == NULL)
return LOG_ERR;
assert(delta && (!isTempTable(c->t) || delta->cs.ts == tr->tid));
if (isTempTable(c->t))
- if ((!inTransaction(tr, c->t) && (odelta != delta || !in_transaction ||
isTempTable(c->t)) && isGlobal(c->t)) || (!isNew(c->t) && isLocalTemp(c->t)))
+ if ((!inTransaction(tr, c->t) && (odelta != delta ||
!segments_in_transaction(tr, c->t) || isTempTable(c->t)) && isGlobal(c->t)) ||
(!isNew(c->t) && isLocalTemp(c->t)))
trans_add(tr, &c->base, delta, &tc_gc_col, &commit_update_col,
isLocalTemp(c->t)?NULL:&log_update_col);
return append_col_execute(tr, delta, c->base.id, offset, i, tpe ==
TYPE_bat);
@@ -1564,14 +1563,13 @@ static int
append_idx(sql_trans *tr, sql_idx * i, void *offset, void *data, int tpe)
{
sql_delta *delta, *odelta = ATOMIC_PTR_GET(&i->data);
- int in_transaction = segments_in_transaction(tr, i->t);
if ((delta = bind_idx_data(tr, i, NULL)) == NULL)
return LOG_ERR;
assert(delta && (!isTempTable(i->t) || delta->cs.ts == tr->tid));
if (isTempTable(i->t))
- if ((!inTransaction(tr, i->t) && (odelta != delta || !in_transaction ||
isTempTable(i->t)) && isGlobal(i->t)) || (!isNew(i->t) && isLocalTemp(i->t)))
+ if ((!inTransaction(tr, i->t) && (odelta != delta ||
!segments_in_transaction(tr, i->t) || isTempTable(i->t)) && isGlobal(i->t)) ||
(!isNew(i->t) && isLocalTemp(i->t)))
trans_add(tr, &i->base, delta, &tc_gc_idx, &commit_update_idx,
isLocalTemp(i->t)?NULL:&log_update_idx);
return append_col_execute(tr, delta, i->base.id, offset, data, tpe ==
TYPE_bat);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
