MonetDB: Jul2015 - cleanup use of BATnew. Al logger bats are voi...

[Niels Nes]

Changeset: 7f439ff7ec74 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7f439ff7ec74
Modified Files:
        gdk/gdk_logger.c
Branch: Jul2015
Log Message:

cleanup use of BATnew. Al logger bats are void, ie including a seqbase of zero.


diffs (57 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -175,7 +175,6 @@ logbat_new(int tt, BUN size, int role)
 
        if (nb) {
                BATseqbase(nb, 0);
-               nb->batDirty |= 2;
                if (role == PERSISTENT)
                        BATmode(nb, PERSISTENT);
        } else {
@@ -1486,9 +1485,9 @@ logger_new(int debug, const char *fn, co
        }
        snapshots_bid = logger_find_bat(lg, "snapshots_bid");
        if (snapshots_bid == 0) {
-               lg->seqs_id = BATnew(TYPE_void, TYPE_int, 1, TRANSIENT);
-               lg->seqs_val = BATnew(TYPE_void, TYPE_lng, 1, TRANSIENT);
-               lg->dseqs = BATnew(TYPE_void, TYPE_oid, 1, TRANSIENT);
+               lg->seqs_id = logbat_new(TYPE_int, 1, TRANSIENT);
+               lg->seqs_val = logbat_new(TYPE_lng, 1, TRANSIENT);
+               lg->dseqs = logbat_new(TYPE_oid, 1, TRANSIENT);
                if (lg->seqs_id == NULL ||
                    lg->seqs_val == NULL ||
                    lg->dseqs == NULL)
@@ -1543,15 +1542,17 @@ logger_new(int debug, const char *fn, co
                        if (o_id == NULL || o_val == NULL)
                                logger_fatal("Logger_new: inconsistent 
database: cannot find seqs bats", 0, 0, 0);
 
+                       BATseqbase(o_id, 0);
+                       BATseqbase(o_val, 0);
                        lg->seqs_id = BATcopy(o_id, TYPE_void, TYPE_int, 1, 
TRANSIENT);
                        lg->seqs_val = BATcopy(o_val, TYPE_void, TYPE_lng, 1, 
TRANSIENT);
                        BBPunfix(o_id->batCacheid);
                        BBPunfix(o_val->batCacheid);
                } else {
-                       lg->seqs_id = BATnew(TYPE_void, TYPE_int, 1, TRANSIENT);
-                       lg->seqs_val = BATnew(TYPE_void, TYPE_lng, 1, 
TRANSIENT);
+                       lg->seqs_id = logbat_new(TYPE_int, 1, TRANSIENT);
+                       lg->seqs_val = logbat_new(TYPE_lng, 1, TRANSIENT);
                }
-               lg->dseqs = BATnew(TYPE_void, TYPE_oid, 1, TRANSIENT);
+               lg->dseqs = logbat_new(TYPE_oid, 1, TRANSIENT);
                if (lg->seqs_id == NULL ||
                    lg->seqs_val == NULL ||
                    lg->dseqs == NULL)
@@ -1577,10 +1578,9 @@ logger_new(int debug, const char *fn, co
                        logger_add_bat(lg, lg->dsnapshots, "dsnapshots");
                }
        }
-       lg->freed = BATnew(TYPE_void, TYPE_int, 1, TRANSIENT);
+       lg->freed = logbat_new(TYPE_int, 1, TRANSIENT);
        if (lg->freed == NULL)
                logger_fatal("Logger_new: failed to create freed bat", 0, 0, 0);
-       BATseqbase(lg->freed, 0);
        snprintf(bak, sizeof(bak), "%s_freed", fn);
        if (BBPrename(lg->freed->batCacheid, bak) < 0)
                logger_fatal("Logger_new: BBPrename to %s failed",
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list