MonetDB: default - Fix logger upgrade.

[Sjoerd Mullender]

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

Fix logger upgrade.
BATappend want a void head in the to-be-appended bat, so provide that.


diffs (34 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1087,12 +1087,17 @@ logger_new(int debug, char *fn, char *lo
        if (bid) {
                /* split catalog -> catalog_bid, catalog_nme */
                BAT *b = BATdescriptor(bid);
+               BAT *v;
 
                lg->catalog_bid = logbat_new(TYPE_void, TYPE_int, BATSIZE);
                lg->catalog_nme = logbat_new(TYPE_void, TYPE_str, BATSIZE);
 
-               BATappend(lg->catalog_bid, BATmirror(b), FALSE);
-               BATappend(lg->catalog_nme, b, FALSE);
+               v = BATmark(b, 0);
+               BATappend(lg->catalog_bid, BATmirror(v), FALSE);
+               BBPunfix(v->batCacheid);
+               v = BATmark(BATmirror(b), 0);
+               BATappend(lg->catalog_nme, BATmirror(v), FALSE);
+               BBPunfix(v->batCacheid);
 
                /* Make persistent */
                bid = lg->catalog_bid->batCacheid;
@@ -1142,7 +1147,9 @@ logger_new(int debug, char *fn, char *lo
                logger_add_bat(lg, lg->seqs_id, "seqs_id");
 
                lg->seqs_val = logbat_new(TYPE_void, TYPE_lng, 1);
-               BATappend(lg->seqs_val, b, FALSE);
+               v = BATmark(BATmirror(b), 0);
+               BATappend(lg->seqs_val, BATmirror(v), FALSE);
+               BBPunfix(v->batCacheid);
                BATmode(lg->seqs_val, PERSISTENT);
                snprintf(bak, BUFSIZ, "%s_seqs_val", fn);
                BBPrename(lg->seqs_val->batCacheid, bak);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list