Changeset: e6ce4d2ae55d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e6ce4d2ae55d
Modified Files:
clients/mapiclient/ReadlineTools.c
clients/mapiclient/mclient.c
cmake/monetdb-defines.cmake
gdk/gdk_batop.c
gdk/gdk_orderidx.c
sql/storage/bat/bat_storage.c
testing/Mtest.py.in
testing/sqllogictest.py
Branch: Mar2025
Log Message:
Merge with Aug2024 branch.
diffs (53 lines):
diff --git a/clients/mapiclient/ReadlineTools.c
b/clients/mapiclient/ReadlineTools.c
--- a/clients/mapiclient/ReadlineTools.c
+++ b/clients/mapiclient/ReadlineTools.c
@@ -307,7 +307,7 @@ continue_completion(rl_completion_func_t
static void
readline_show_error(const char *msg) {
rl_save_prompt();
- rl_message(msg);
+ rl_message("%s", msg);
rl_restore_prompt();
rl_clear_message();
}
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -511,7 +511,6 @@ append_msk_bat(BAT *b, BATiter *ni, stru
uint32_t boff = b->batCount % 32;
uint32_t *bp = (uint32_t *) b->theap->base + b->batCount / 32;
b->batCount += ci->ncand;
- b->theap->free = ((b->batCount + 31) / 32) * 4;
if (ci->tpe == cand_dense) {
const uint32_t *np;
uint32_t noff, mask;
@@ -664,6 +663,7 @@ append_msk_bat(BAT *b, BATiter *ni, stru
} while (!is_oid_nil(o));
}
b->theap->dirty = true;
+ b->theap->free = ((b->batCount + 31) / 32) * 4;
MT_lock_unset(&b->theaplock);
return GDK_SUCCEED;
}
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -54,6 +54,7 @@ BATidxsync(void *arg)
if (!(ATOMIC_GET(&GDKdebug) & NOSYNCMASK) &&
MT_msync(hp->base, SIZEOF_OID) < 0) {
hp->dirty = true;
+ failed = " sync failed";
((oid *) hp->base)[0] &= ~((oid) 1 <<
24);
} else {
failed = ""; /* not failed */
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
@@ -328,7 +328,6 @@ segments2cs(sql_trans *tr, segments *seg
b->tkey = false;
b->tnokey[0] = 0;
b->tnokey[1] = 0;
- b->theap->dirty = true;
BUN cnt = BATcount(b);
uint32_t *restrict dst;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
