MonetDB: Jun2020 - Reduce ABI change with Jun2020-SP1 and with O...

[Sjoerd Mullender]

Changeset: e4976165e9db for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e4976165e9db
Modified Files:
        clients/Tests/exports.stable.out
        gdk/gdk_logger.c
        gdk/gdk_logger.h
        sql/storage/bat/bat_logger.c
Branch: Jun2020
Log Message:

Reduce ABI change with Jun2020-SP1 and with Oct2020.
No incompatible changes, just an extensions since the last release in
the branch.


diffs (106 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -511,9 +511,10 @@ gdk_return logger_cleanup(logger *lg);
 logger *logger_create(int debug, const char *fn, const char *logdir, int 
version, preversionfix_fptr prefuncp, postversionfix_fptr postfuncp);
 gdk_return logger_del_bat(logger *lg, log_bid bid) 
__attribute__((__warn_unused_result__));
 void logger_destroy(logger *lg);
-gdk_return logger_exit(logger *lg, lng save_id);
+gdk_return logger_exit(logger *lg);
 log_bid logger_find_bat(logger *lg, const char *name, char tpe, oid id);
-gdk_return logger_restart(logger *lg, lng save_id);
+gdk_return logger_flush(logger *lg, lng save_id);
+gdk_return logger_restart(logger *lg);
 int logger_sequence(logger *lg, int seq, lng *id);
 gdk_return logger_upgrade_bat(logger *lg, const char *name, char tpe, oid id) 
__attribute__((__warn_unused_result__));
 void logger_with_ids(logger *lg);
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2381,6 +2381,12 @@ logger_new(int debug, const char *fn, co
        return NULL;
 }
 
+gdk_return
+logger_restart(logger *lg)
+{
+       return logger_flush(lg, lg->tid);
+}
+
 /* Create a new logger */
 logger *
 logger_create(int debug, const char *fn, const char *logdir, int version, 
preversionfix_fptr prefuncp, postversionfix_fptr postfuncp)
@@ -2406,7 +2412,7 @@ logger_create(int debug, const char *fn,
        }
        fflush(stdout);
        if (lg->changes &&
-           (logger_restart(lg, lg->tid) != GDK_SUCCEED ||
+           (logger_restart(lg) != GDK_SUCCEED ||
             logger_cleanup(lg) != GDK_SUCCEED)) {
                logger_destroy(lg);
                return NULL;
@@ -2422,7 +2428,7 @@ logger_destroy(logger *lg)
                BAT *b = lg->catalog_bid;
 
                if (lg->changes &&
-                   (logger_restart(lg, lg->tid+1) != GDK_SUCCEED ||
+                   (logger_flush(lg, lg->tid+1) != GDK_SUCCEED ||
                     logger_cleanup(lg) != GDK_SUCCEED))
                        TRC_CRITICAL(GDK, "logger_cleanup failed\n");
 
@@ -2456,8 +2462,8 @@ logger_destroy(logger *lg)
        GDKfree(lg);
 }
 
-gdk_return
-logger_exit(logger *lg, lng save_id)
+static gdk_return
+logger_end(logger *lg, lng save_id)
 {
        FILE *fp;
        char filename[FILENAME_MAX];
@@ -2550,9 +2556,15 @@ logger_exit(logger *lg, lng save_id)
 }
 
 gdk_return
-logger_restart(logger *lg, lng save_id)
+logger_exit(logger *lg)
 {
-       if (logger_exit(lg, save_id) == GDK_SUCCEED &&
+       return logger_end(lg, lg->tid);
+}
+
+gdk_return
+logger_flush(logger *lg, lng save_id)
+{
+       if (logger_end(lg, save_id) == GDK_SUCCEED &&
            logger_open(lg) == GDK_SUCCEED)
                return GDK_SUCCEED;
        return GDK_FAIL;
diff --git a/gdk/gdk_logger.h b/gdk/gdk_logger.h
--- a/gdk/gdk_logger.h
+++ b/gdk/gdk_logger.h
@@ -105,8 +105,9 @@ typedef int log_bid;
 
 gdk_export logger *logger_create(int debug, const char *fn, const char 
*logdir, int version, preversionfix_fptr prefuncp, postversionfix_fptr 
postfuncp);
 gdk_export void logger_destroy(logger *lg);
-gdk_export gdk_return logger_exit(logger *lg, lng save_id);
-gdk_export gdk_return logger_restart(logger *lg, lng save_id);
+gdk_export gdk_return logger_exit(logger *lg);
+gdk_export gdk_return logger_restart(logger *lg);
+gdk_export gdk_return logger_flush(logger *lg, lng save_id);
 gdk_export gdk_return logger_cleanup(logger *lg);
 gdk_export void logger_with_ids(logger *lg);
 gdk_export lng logger_changes(logger *lg);
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
@@ -838,7 +838,7 @@ static int
 bl_restart(lng save_id)
 {
        if (bat_logger)
-               return logger_restart(bat_logger, save_id) == GDK_SUCCEED ? 
LOG_OK : LOG_ERR;
+               return logger_flush(bat_logger, save_id) == GDK_SUCCEED ? 
LOG_OK : LOG_ERR;
        return LOG_OK;
 }
 
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org