MonetDB: Jun2020 - improved store exit code, ie cleanup more whe...

[Niels Nes]

Changeset: ec64252a9d24 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ec64252a9d24
Modified Files:
        gdk/gdk_logger.c
        sql/storage/bat/bat_logger.c
Branch: Jun2020
Log Message:

improved store exit code, ie cleanup more when exiting.


diffs (35 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2410,7 +2410,9 @@ logger_destroy(logger *lg)
                BUN p, q;
                BAT *b = lg->catalog_bid;
 
-               if (logger_cleanup(lg) != GDK_SUCCEED)
+               if (lg->changes &&
+                   (logger_restart(lg, lg->tid) != GDK_SUCCEED ||
+                    logger_cleanup(lg) != GDK_SUCCEED))
                        TRC_CRITICAL(GDK, "logger_cleanup failed\n");
 
                /* free resources */
diff --git a/sql/storage/bat/bat_logger.c b/sql/storage/bat/bat_logger.c
--- a/sql/storage/bat/bat_logger.c
+++ b/sql/storage/bat/bat_logger.c
@@ -829,15 +829,9 @@ bl_destroy(void)
 {
        logger *l = bat_logger;
 
+       logger_destroy(l);
+
        bat_logger = NULL;
-       if (l) {
-               close_stream(l->log);
-               GDKfree(l->fn);
-               GDKfree(l->dir);
-               GDKfree(l->local_dir);
-               GDKfree(l->buf);
-               GDKfree(l);
-       }
 }
 
 static int
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list