MonetDB: newstorage - merged

[Niels Nes]

Changeset: b49159582596 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b49159582596
Modified Files:
        gdk/gdk_logger.c
        sql/storage/store.c
Branch: newstorage
Log Message:

merged


diffs (70 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2047,7 +2047,7 @@ log_range(logger *lg, int flag, oid rid,
                        return LOG_ERR;
 
                if (lg->debug & 1)
-                       fprintf(stderr, "#Logged %s <" LLFMT "," LLFMT "> 
%s\n", name, rid, l.nr, (flag==LOG_RELEASE)?"release":"claim");
+                       fprintf(stderr, "#Logged %s <" OIDFMT "," LLFMT "> 
%s\n", name, rid, l.nr, (flag==LOG_RELEASE)?"release":"claim");
        }
        return LOG_OK;
 }
@@ -2479,10 +2479,11 @@ logger_del_mvcc(logger *lg, mvcc_t *m, c
        if (lg->debug & 1)
                fprintf(stderr, "#del %s\n", name);
        assert(p != BUN_NONE);
+       (void)m;
+       //TODO
        //mvcc_destroy(m);
        BUNdelete(lg->mvcc_nme, p, FALSE);
        BUNdelete(lg->mvcc_ptr, p, FALSE);
-       return LOG_OK;
 }
 
 mvcc_t *
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1777,11 +1777,12 @@ idx_dup(sql_trans *tr, int flag, sql_idx
 
        assert(flag == TR_OLD || tr->parent == gtrans);
 
-       if (i->data && !ni->data)
+       if (i->data && !ni->data) {
                if (isTempTable(i->t))
                        store_funcs.create_idx(tr, i);
                else
                        store_funcs.dup_idx(tr, i, ni);
+       }
 
        if (isNew(i) && flag == TR_NEW && tr->parent == gtrans) {
                i->base.flag = TR_OLD;
@@ -1899,11 +1900,12 @@ column_dup(sql_trans *tr, int flag, sql_
        if (oc->storage_type)
                c->storage_type = sa_strdup(sa, oc->storage_type);
 
-       if (oc->data && !c->data)
+       if (oc->data && !c->data) {
                if (isTempTable(c->t))
                        store_funcs.create_col(tr, c);
                else
                        store_funcs.dup_col(tr, oc, c);
+       }
        if (isNew(oc) && flag == TR_NEW && tr->parent == gtrans) {
                oc->base.flag = TR_OLD;
                c->base.flag = TR_OLD;
@@ -2073,11 +2075,12 @@ table_dup(sql_trans *tr, int flag, sql_t
        t->pkey = NULL;
 
        t->s = s;
-       if (ot->data && !t->data)
+       if (ot->data && !t->data) {
                if (isTempTable(t))
                        store_funcs.create_del(tr, t);
                else
                        store_funcs.dup_del(tr, ot, t);
+       }
 
        t->sz = ot->sz;
        t->cleared = 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list