Changeset: 98dcbf57d359 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/98dcbf57d359
Modified Files:
sql/test/rel-optimizers/Tests/merge-unions.test
Branch: default
Log Message:
Merge with Aug2024 branch.
diffs (81 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));
}
diff --git a/sql/test/rel-optimizers/Tests/merge-unions.test
b/sql/test/rel-optimizers/Tests/merge-unions.test
--- a/sql/test/rel-optimizers/Tests/merge-unions.test
+++ b/sql/test/rel-optimizers/Tests/merge-unions.test
@@ -137,7 +137,7 @@ munion (
| ) [ "f_merge"."n" UNIQUE ]
) [ "f_merge"."n" ]
-query T nosort
+query T rowsort
select * from f_merge
where n > 1 and n < 5
----
@@ -209,20 +209,18 @@ query I rowsort
select * from f_merge_rec
where n > 1 and n < 5
----
-1
2
2
3
3
4
4
-5
query T nosort
plan select * from f_merge_rec
where n > 1 and n < 5
----
-tmunion (
+munion (
| project (
| | select (
| | | table("sys"."f1") [ "f1"."n" UNIQUE as "f_merge_rec"."n" ]
@@ -245,7 +243,7 @@ tmunion (
| ) [ "f_merge_rec"."n" UNIQUE ]
) [ "f_merge_rec"."n" ]
-query II nosort
+query II rowsort
select n, count(n) from f_merge_rec group by n
----
1
@@ -259,4 +257,3 @@ 2
5
1
-
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
