MonetDB: hammertime - Remove rtime from sql_trans. We don't need...

[Aris Koning]

Changeset: 651ae1c5320f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=651ae1c5320f
Modified Files:
        sql/include/sql_catalog.h
        sql/storage/bat/bat_storage.c
        sql/storage/store.c
Branch: hammertime
Log Message:

Remove rtime from sql_trans. We don't need it.


diffs (80 lines):

diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -241,7 +241,6 @@ typedef struct sql_trans {
        char *name;
        int stime;              /* start of transaction */
        int wstime;             /* first write transaction time stamp */
-       int rtime;              /* timestamp of latest read performed in 
transaction*/
        int wtime;              /* timestamp of latest write performed in 
transaction*/
        int schema_number;      /* schema timestamp */
        int schema_updates;     /* set on schema changes */
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
@@ -132,7 +132,7 @@ bind_uidx(sql_trans *tr, sql_idx * i, in
                i->t->data = timestamp_dbat(ot->data, i->t->base.stime);
        }
        assert(tr != gtrans);
-       i->base.rtime = i->t->base.rtime = i->t->s->base.rtime = tr->rtime = 
tr->stime;
+       i->base.rtime = i->t->base.rtime = i->t->s->base.rtime = tr->stime;
        u = delta_bind_ubat(i->data, access, 
(oid_index(i->type))?TYPE_oid:TYPE_lng);
        return u;
 }
@@ -220,7 +220,7 @@ bind_col(sql_trans *tr, sql_column *c, i
                return bind_ucol(tr, c, access);
        assert(access == QUICK || tr != gtrans);
        if (tr && access != QUICK)
-               c->base.rtime = c->t->base.rtime = c->t->s->base.rtime = 
tr->rtime = tr->stime;
+               c->base.rtime = c->t->base.rtime = c->t->s->base.rtime = 
tr->stime;
        return delta_bind_bat( c->data, access, isTemp(c));
 }
 
@@ -238,7 +238,7 @@ bind_idx(sql_trans *tr, sql_idx * i, int
                return bind_uidx(tr, i, access);
        assert(access == QUICK || tr != gtrans);
        if (tr && access != QUICK)
-               i->base.rtime = i->t->base.rtime = i->t->s->base.rtime = 
tr->rtime = tr->stime;
+               i->base.rtime = i->t->base.rtime = i->t->s->base.rtime = 
tr->stime;
        return delta_bind_bat( i->data, access, isTemp(i));
 }
 
@@ -623,7 +623,7 @@ update_col(sql_trans *tr, sql_column *c,
        bat = c->data;
        bat->wtime = c->base.wtime = c->t->base.wtime = c->t->s->base.wtime = 
tr->wtime = tr->wstime;
        assert(tr != gtrans);
-       c->base.rtime = c->t->base.rtime = c->t->s->base.rtime = tr->rtime = 
tr->stime;
+       c->base.rtime = c->t->base.rtime = c->t->s->base.rtime = tr->stime;
        if (tpe == TYPE_bat)
                return delta_update_bat(bat, tids, upd, isNew(c));
        else
@@ -663,7 +663,7 @@ update_idx(sql_trans *tr, sql_idx * i, v
        bat = i->data;
        bat->wtime = i->base.wtime = i->t->base.wtime = i->t->s->base.wtime = 
tr->wtime = tr->wstime;
        assert(tr != gtrans);
-       i->base.rtime = i->t->base.rtime = i->t->s->base.rtime = tr->rtime = 
tr->stime;
+       i->base.rtime = i->t->base.rtime = i->t->s->base.rtime = tr->stime;
        if (tpe == TYPE_bat)
                return delta_update_bat(bat, tids, upd, isNew(i));
        else
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1366,7 +1366,7 @@ create_trans(sql_allocator *sa)
 
        t->sa = sa;
        t->name = NULL;
-       t->wtime = t->rtime = 0;
+       t->wtime = 0;
        t->stime = 0;
        t->wstime = timestamp();
        t->schema_updates = 0;
@@ -3757,7 +3757,7 @@ schema_dup(sql_trans *tr, int flags, sql
 static void
 _trans_init(sql_trans *tr, sql_trans *otr)
 {
-       tr->wtime = tr->rtime = 0;
+       tr->wtime = 0;
        tr->stime = otr->wtime;
        tr->wstime = timestamp();
        tr->schema_updates = 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list