Changeset: 4abd55aed644 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4abd55aed644
Modified Files:
sql/storage/bat/bat_storage.c
Branch: Oct2012
Log Message:
fix for bug 3222
ie make sure appends get correctly handled
diffs (32 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
@@ -303,7 +303,8 @@ append_col(sql_trans *tr, sql_column *c,
{
sql_delta *bat = c->data;
- /* appends only write */
+ /* appends only write (isn't save!, ie also set read times) */
+ c->base.rtime = c->t->base.rtime = c->t->s->base.rtime = tr->rtime =
tr->stime;
c->base.wtime = c->t->base.wtime = c->t->s->base.wtime = tr->wtime =
tr->wstime;
if (tpe == TYPE_bat)
delta_append_bat(bat, i);
@@ -316,7 +317,8 @@ append_idx(sql_trans *tr, sql_idx * i, v
{
sql_delta *bat = i->data;
- /* appends only write */
+ /* appends only write (isn't save!, ie also set read times) */
+ i->base.rtime = i->t->base.rtime = i->t->s->base.rtime = tr->rtime =
tr->stime;
i->base.wtime = i->t->base.wtime = i->t->s->base.wtime = tr->wtime =
tr->wstime;
if (tpe == TYPE_bat)
delta_append_bat(bat, ib);
@@ -1381,6 +1383,8 @@ tr_update_delta( sql_trans *tr, sql_delt
bat_destroy(pi);
} else {
BATcommit(ins);
+ obat->cnt = cbat->cnt;
+ obat->ibase = cbat->ibase;
}
}
bat_destroy(ins);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
