Changeset: 25af433d5586 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/25af433d5586
Modified Files:
sql/storage/bat/bat_storage.c
sql/storage/store.c
Branch: Dec2023
Log Message:
make sure to use lng instead of int, solve problems with loading data with >
2147483647 rows
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
@@ -4723,7 +4723,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);
@@ -4803,7 +4803,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
@@ -4033,7 +4033,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 -- [email protected]
To unsubscribe send an email to [email protected]
