MonetDB: Feb2013 - merge with Oct2012

[Niels Nes]

Changeset: 78fb38a41234 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=78fb38a41234
Modified Files:
        sql/storage/bat/bat_storage.c
Branch: Feb2013
Log Message:

merge with Oct2012


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
@@ -334,7 +334,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);
@@ -347,7 +348,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);
@@ -1455,6 +1457,8 @@ tr_update_delta( sql_trans *tr, sql_delt
                        }
                } else {
                        BATcommit(ins);
+                       obat->cnt = cbat->cnt;
+                       obat->ibase = cbat->ibase;
                }
        }
        if (obat->cnt != cbat->cnt) { /* locked */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list