MonetDB: HTM - Pass at tstart and keep the HTM id in the logger

[Dimitar Nedev]

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

Pass at tstart and keep the HTM id in the logger


diffs (104 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1236,6 +1236,7 @@ logger_new(int debug, const char *fn, co
        lg->id = 1;
 
        lg->tid = 0;
+       lg->htm_id = -1;
 #if SIZEOF_OID == 8
        lg->read32bitoid = 0;
 #endif
@@ -1844,7 +1845,7 @@ log_bat_persists(logger *lg, BAT *b, con
        }
        l.flag = flag;
        l.tid = lg->tid;
-       l.htm_id = -1;
+       l.htm_id = lg->htm_id;
        lg->changes++;
        if (log_write_format(lg, &l) == LOG_ERR ||
            log_write_string(lg, name) == LOG_ERR)
@@ -1910,7 +1911,7 @@ log_bat_transient(logger *lg, const char
        l.flag = LOG_DESTROY;
        l.tid = lg->tid;
        l.nr = 0;
-       l.htm_id = -1;
+       l.htm_id = lg->htm_id;
        lg->changes++;
 
        /* if this is a snapshot bat, we need to skip all changes */
@@ -1971,7 +1972,7 @@ log_delta(logger *lg, BAT *uid, BAT *uva
 
        l.tid = lg->tid;
        l.nr = (BUNlast(uval) - BUNfirst(uval));
-       l.htm_id = -1;
+       l.htm_id = lg->htm_id;
        lg->changes += l.nr;
 
        if (l.nr) {
@@ -2015,7 +2016,7 @@ log_bat(logger *lg, BAT *b, const char *
 
        l.tid = lg->tid;
        l.nr = (BUNlast(b) - b->batInserted);
-       l.htm_id = -1;
+       l.htm_id = lg->htm_id;
        lg->changes += l.nr;
 
        if (l.nr) {
@@ -2089,7 +2090,7 @@ log_bat_clear(logger *lg, const char *na
 
        l.nr = 1;
        l.tid = lg->tid;
-       l.htm_id = -1;
+       l.htm_id = lg->htm_id;
        lg->changes += l.nr;
 
        l.flag = LOG_CLEAR;
@@ -2111,7 +2112,8 @@ log_tstart(logger *lg, lng htm_id)
        l.flag = LOG_START;
        l.tid = ++lg->tid;
        l.nr = lg->tid;
-       l.htm_id = htm_id;
+       lg->htm_id = htm_id;
+       l.htm_id = lg->htm_id;
 
        if (lg->debug & 1)
                fprintf(stderr, "#log_tstart %d:" LLFMT "\n", lg->tid, htm_id);
@@ -2206,7 +2208,7 @@ log_tend(logger *lg)
        l.flag = LOG_END;
        l.tid = lg->tid;
        l.nr = lg->tid;
-       l.htm_id = -1;
+       l.htm_id = lg->htm_id;
        if (res != GDK_SUCCEED ||
            log_write_format(lg, &l) == LOG_ERR ||
            mnstr_flush(lg->log) ||
@@ -2229,7 +2231,7 @@ log_abort(logger *lg)
        l.flag = LOG_END;
        l.tid = lg->tid;
        l.nr = -1;
-       l.htm_id = -1;
+       l.htm_id = lg->htm_id;
 
        if (log_write_format(lg, &l) == LOG_ERR)
                return LOG_ERR;
@@ -2245,7 +2247,7 @@ log_sequence_(logger *lg, int seq, lng v
        l.flag = LOG_SEQ;
        l.tid = lg->tid;
        l.nr = seq;
-       l.htm_id = -1;
+       l.htm_id = lg->htm_id;
 
        if (lg->debug & 1)
                fprintf(stderr, "#log_sequence_ (%d," LLFMT ")\n", seq, val);
diff --git a/gdk/gdk_logger.h b/gdk/gdk_logger.h
--- a/gdk/gdk_logger.h
+++ b/gdk/gdk_logger.h
@@ -43,6 +43,7 @@ typedef struct logger {
        int version;
        lng id;
        int tid;
+       lng htm_id;
 #if SIZEOF_OID == 8
        /* on 64-bit architecture, read OIDs as 32 bits (for upgrading
         * oid size) */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list