MonetDB: insertonly - Use batCacheid now(view case handled previ...

[Lucas Pereira via checkin-list]

Changeset: c1bab2367e77 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c1bab2367e77
Modified Files:
        gdk/gdk_logger.c
        sql/backends/monet5/sql.c
Branch: insertonly
Log Message:

Use batCacheid now(view case handled previously) + LOG_TINY macro to increase 
log rotation.


diffs (55 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -13,6 +13,7 @@
 #include "gdk_private.h"
 #include "gdk_logger.h"
 #include "gdk_logger_internals.h"
+/* #include "gdk_utils.h" */
 #include "mutils.h"
 #include <string.h>
 
@@ -2990,6 +2991,7 @@ log_delta(logger *lg, BAT *uid, BAT *uva
 #define DBLKSZ         8192
 #define SEGSZ          (64*DBLKSZ)
 
+#define LOG_TINY        (LL_CONSTANT(2))
 #define LOG_MINI       (LL_CONSTANT(2)*1024)
 #define LOG_LARGE      (LL_CONSTANT(2)*1024*1024*1024)
 
@@ -3005,7 +3007,8 @@ check_rotation_conditions(logger *lg)
                return true;
        const lng p = (lng) getfilepos(getFile(lg->current->output_log));
 
-       const lng log_large = (ATOMIC_GET(&GDKdebug) & FORCEMITOMASK) ? 
LOG_MINI : LOG_LARGE;
+       const lng log_large = (ATOMIC_GET(&GDKdebug) & FORCEMITOMASK) ? 
LOG_MINI :
+               GDKgetenv_istrue("insertonly_nowal") ? LOG_TINY : LOG_LARGE;
        bool res = (lg->saved_id + 1 >= lg->id && lg->current->drops > 100000) 
|| (p > log_large);
        if (res)
                return (ATOMIC_GET(&lg->nr_open_files) < 8);
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -4339,7 +4339,7 @@ SQLinsertonly_persist(Client cntxt, MalB
 
        if (store->insertonly_nowal == false) {
                msg = createException(SQL, "sql.insertonly_persist", "Function 
cannot be used without setting "
-                                                         "insertonly_persist 
flag at server startup.");
+                                                         "insertonly_nowal 
flag at server startup.");
                return msg;
        }
 
@@ -4414,11 +4414,11 @@ SQLinsertonly_persist(Client cntxt, MalB
 
                                                        if (commit_list == NULL 
|| sizes == NULL) {
                                                                msg = 
createException(SQL, "insertonly_persist", SQLSTATE(HY001));
-                                                               goto exit2;
+                                                               goto exit1;
                                                        }
 
                                                        commit_list[i] = 
t_storage->cs.bid;
-                                                       commit_list[i+1] = 
bs->theap->parentid;
+                                                       commit_list[i+1] = 
bs->batCacheid;
                                                        sizes[i] = 
!bs->batTransient ? BATcount(bs) : 0;
                                                        sizes[i+1] = 
!bs->batTransient ? BATcount(bs) : 0;
 
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org