Changeset: e8e4c8a30b2e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e8e4c8a30b2e Modified Files: sql/storage/bat/bat_storage.c Branch: Jun2016 Log Message:
backout 59400:c8e4f24b17ef diffs (73 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 @@ -1739,18 +1739,16 @@ gtr_update_table(sql_trans *tr, sql_tabl int ok = LOG_OK; node *n; - if (t->base.wtime <= t->base.allocated) - return ok; gtr_update_dbat(t->data, tchanges); for (n = t->columns.set->h; ok == LOG_OK && n; n = n->next) { int changes = 0; sql_column *c = n->data; - if (!c->base.wtime || c->base.wtime <= c->base.allocated) + if (!c->base.wtime) continue; ok = gtr_update_delta(tr, c->data, &changes); if (changes) - c->base.allocated = c->base.wtime = tr->wstime; + c->base.wtime = tr->wstime; (*tchanges) |= changes; } if (ok == LOG_OK && t->idxs.set) { @@ -1759,17 +1757,17 @@ gtr_update_table(sql_trans *tr, sql_tabl sql_idx *ci = n->data; /* some indices have no bats */ - if (!ci->base.wtime || ci->base.wtime <= ci->base.allocated) + if (!ci->base.wtime) continue; ok = gtr_update_delta(tr, ci->data, &changes); if (changes) - ci->base.allocated = ci->base.wtime = tr->wstime; + ci->base.wtime = tr->wstime; (*tchanges) |= changes; } } if (*tchanges) - t->base.allocated = t->base.wtime = tr->wstime; + t->base.wtime = tr->wstime; return ok; } @@ -1785,11 +1783,6 @@ static int int schanges = 0; sql_schema *s = sn->data; - if (s->base.wtime <= s->base.allocated && - gtr_update_table_f == gtr_update_table) - continue; - if (!s->base.wtime) - continue; if (!isTempSchema(s) && s->tables.set) { node *n; for (n = s->tables.set->h; n && ok == LOG_OK; n = n->next) { @@ -1801,12 +1794,12 @@ static int schanges |= changes; } } - if (schanges && gtr_update_table_f == gtr_update_table){ - s->base.allocated = s->base.wtime = tr->wstime; + if (schanges){ + s->base.wtime = tr->wstime; tchanges ++; } } - if (tchanges && gtr_update_table_f == gtr_update_table) + if (tchanges) tr->wtime = tr->wstime; return LOG_OK; } _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list