MonetDB: Aug2024 - Merge with Dec2023 branch.

[Sjoerd Mullender via checkin-list]

Changeset: 8f14f1d9f9d6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8f14f1d9f9d6
Modified Files:
        sql/storage/bat/bat_storage.c
        sql/storage/store.c
Branch: Aug2024
Log Message:

Merge with Dec2023 branch.


diffs (33 lines):

diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -4729,7 +4729,7 @@ claim_segmentsV2(sql_trans *tr, sql_tabl
                        in_transaction = true;
                }
                if (in_transaction && !NOT_TO_BE_LOGGED(t))
-                       tr->logchanges += (int) total;
+                       tr->logchanges += (lng) total;
                if (*offsets) {
                        BAT *pos = *offsets;
                        assert(BATcount(pos) == total);
@@ -4809,7 +4809,7 @@ claim_segments(sql_trans *tr, sql_table 
                        in_transaction = true;
                }
                if (in_transaction && !NOT_TO_BE_LOGGED(t))
-                       tr->logchanges += (int) cnt;
+                       tr->logchanges += (lng) cnt;
                *offset = slot;
        }
        return ok;
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -4070,7 +4070,7 @@ sql_trans_commit(sql_trans *tr)
                const bool log = !tr->parent && tr->logchanges > 0;
 
                if (log) {
-                       const int min_changes = ATOMIC_GET(&GDKdebug) & 
FORCEMITOMASK ? 5 : 1000000;
+                       const lng min_changes = ATOMIC_GET(&GDKdebug) & 
FORCEMITOMASK ? 5 : 1000000;
                        flush = (tr->logchanges > min_changes && 
list_empty(store->changes));
                }
 
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org