MonetDB: Aug2024 - Initialize output_log field if WAL disabled; ...

[Sjoerd Mullender via checkin-list]

Changeset: 99ab98dad82b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/99ab98dad82b
Modified Files:
        gdk/gdk_logger.c
Branch: Aug2024
Log Message:

Initialize output_log field if WAL disabled; better check in log_printinfo.


diffs (22 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1168,6 +1168,8 @@ log_open_output(logger *lg)
                        return GDK_FAIL;
                }
                GDKfree(filename);
+       } else {
+               new_range->output_log = NULL;
        }
        ATOMIC_INIT(&new_range->refcount, 1);
        ATOMIC_INIT(&new_range->last_ts, 0);
@@ -3530,7 +3532,8 @@ log_printinfo(logger *lg)
               lg->catalog_bid->batCount, lg->dcatalog->batCount);
        for (logged_range *p = lg->pending; p; p = p->next) {
                char buf[32];
-               if (p->output_log == NULL ||
+               if ((lg->debug & 128 || lg->inmemory) ||
+                   p->output_log == NULL ||
                    snprintf(buf, sizeof(buf), ", file size %"PRIu64, 
(uint64_t) getfilepos(getFile(lg->current->output_log))) >= (int) sizeof(buf))
                        buf[0] = 0;
                printf("pending range "ULLFMT": drops %"PRIu64", last_ts 
%"PRIu64", flushed_ts %"PRIu64", refcount %"PRIu64"%s%s\n", p->id, (uint64_t) 
ATOMIC_GET(&p->drops), (uint64_t) ATOMIC_GET(&p->last_ts), (uint64_t) 
ATOMIC_GET(&p->flushed_ts), (uint64_t) ATOMIC_GET(&p->refcount), buf, p == 
lg->current ? " (current)" : "");
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org