MonetDB: default - Remove dead code.

[Aris Koning]

Changeset: 5a5efa0feea2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5a5efa0feea2
Modified Files:
        gdk/gdk_logger.c
        gdk/gdk_logger_internals.h
Branch: default
Log Message:

Remove dead code.


diffs (73 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2367,12 +2367,6 @@ log_constant(logger *lg, int type, ptr v
        gdk_return ok = GDK_SUCCEED;
        logformat l;
        lng nr;
-       int is_row = 0;
-
-       if (lg->row_insert_nrcols != 0) {
-               lg->row_insert_nrcols--;
-               is_row = 1;
-       }
        l.flag = LOG_UPDATE_CONST;
        l.id = id;
        nr = cnt;
@@ -2389,12 +2383,10 @@ log_constant(logger *lg, int type, ptr v
 
        gdk_return (*wt) (const void *, stream *, size_t) = 
BATatoms[type].atomWrite;
 
-       if (is_row)
-               l.flag = tpe;
        if (log_write_format(lg, &l) != GDK_SUCCEED ||
-           (!is_row && !mnstr_writeLng(lg->output_log, nr)) ||
-           (!is_row && mnstr_write(lg->output_log, &tpe, 1, 1) != 1) ||
-           (!is_row && !mnstr_writeLng(lg->output_log, offset))) {
+           !mnstr_writeLng(lg->output_log, nr) ||
+           mnstr_write(lg->output_log, &tpe, 1, 1) != 1 ||
+           !mnstr_writeLng(lg->output_log, offset)) {
                (void) ATOMIC_DEC(&lg->refcount);
                ok = GDK_FAIL;
                goto bailout;
@@ -2467,12 +2459,6 @@ internal_log_bat(logger *lg, BAT *b, log
        logformat l;
        BUN p;
        lng nr;
-       int is_row = 0;
-
-       if (lg->row_insert_nrcols != 0) {
-               lg->row_insert_nrcols--;
-               is_row = 1;
-       }
        l.flag = LOG_UPDATE_BULK;
        l.id = id;
        nr = cnt;
@@ -2487,12 +2473,10 @@ internal_log_bat(logger *lg, BAT *b, log
 
        gdk_return (*wt) (const void *, stream *, size_t) = 
BATatoms[b->ttype].atomWrite;
 
-       if (is_row)
-               l.flag = tpe;
        if (log_write_format(lg, &l) != GDK_SUCCEED ||
-           (!is_row && !mnstr_writeLng(lg->output_log, nr)) ||
-           (!is_row && mnstr_write(lg->output_log, &tpe, 1, 1) != 1) ||
-           (!is_row && !mnstr_writeLng(lg->output_log, offset))) {
+           !mnstr_writeLng(lg->output_log, nr) ||
+           mnstr_write(lg->output_log, &tpe, 1, 1) != 1 ||
+           !mnstr_writeLng(lg->output_log, offset)) {
                ok = GDK_FAIL;
                goto bailout;
        }
diff --git a/gdk/gdk_logger_internals.h b/gdk/gdk_logger_internals.h
--- a/gdk/gdk_logger_internals.h
+++ b/gdk/gdk_logger_internals.h
@@ -32,8 +32,6 @@ struct logger {
        logged_range *pending;
        logged_range *current;
 
-       int row_insert_nrcols;  /* nrcols == 0 no rowinsert, log_update will 
include the logformat */
-
        bool inmemory;
        char *fn;
        char *dir;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org