MonetDB: nospare - add commit of idx's

[Niels Nes]

Changeset: 9b641084c1d9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9b641084c1d9
Modified Files:
        sql/storage/bat/bat_storage.c
        sql/storage/store.c
Branch: nospare
Log Message:

add commit of idx's
more cleanup..


diffs (58 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
@@ -1889,9 +1889,11 @@ log_destroy_idx_(sql_trans *tr, sql_idx 
 
        int ok = LOG_OK;
        assert(!isTempTable(i->t));
-       sql_delta *delta = i->data;
-       delta->ts = commit_ts;
-       ok = log_destroy_delta(tr, i->data, i->t->bootstrap?0:LOG_IDX, 
i->base.id);
+       if (i->data) {
+               sql_delta *delta = i->data;
+               delta->ts = commit_ts;
+               ok = log_destroy_delta(tr, i->data, i->t->bootstrap?0:LOG_IDX, 
i->base.id);
+       }
        return ok;
 }
 
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -238,6 +238,12 @@ tc_commit_table_(sql_trans *tr, sql_tabl
                sql_column *c = n->data;
                c->base.ts = commit_ts;
        }
+       if (t->idxs.set) {
+               for (node* n = t->idxs.set->h; n; n = n->next) {
+                       sql_idx *i = n->data;
+                       i->base.ts = commit_ts;
+               }
+       }
        return LOG_OK;
 }
 
@@ -3379,20 +3385,13 @@ sql_trans_create_(sqlstore *store, sql_t
 
        if (name)
                tr->name = sa_strdup(tr->sa, name);
-       if (parent)
-               fprintf(stderr, "implement savepoints again\n");
        tr->cat = store->cat;
        if (!tr->cat)
                store->cat = tr->cat = SA_ZNEW(tr->sa, sql_catalog);
-       /* TODO for temp schema, find and recreate content with new transaction 
id */
        tr->tmp = find_sql_schema(tr, "tmp");
-       /*
-       if (gtrans) {
-               tr = trans_dup((parent) ? parent : gtrans, name);
-               TRC_DEBUG(SQL_STORE, "New transaction: %p\n", tr);
-       }
-       tr->store = store;
-       */
+       if (!parent)
+               tr->parent = parent;
+       TRC_DEBUG(SQL_STORE, "New transaction: %p\n", tr);
        return tr;
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list