Changeset: 907ee677cac5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/907ee677cac5
Modified Files:
gdk/gdk.h
gdk/gdk_logger.c
Branch: Dec2025
Log Message:
Fixing some code that was never exercised.
diffs (42 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1331,7 +1331,7 @@ Tpos(BATiter *bi, BUN p)
if (bi->vh) {
oid o;
assert(!is_oid_nil(bi->tseq));
- if (((ccand_t *) bi->vh)->type == CAND_NEGOID) {
+ if (((ccand_t *) bi->vh->base)->type == CAND_NEGOID) {
BUN nexc = (bi->vhfree - sizeof(ccand_t)) / SIZEOF_OID;
o = bi->tseq + p;
if (nexc > 0) {
@@ -1361,9 +1361,14 @@ Tpos(BATiter *bi, BUN p)
uint32_t m = candmask_pop(msk[i]);
if (o + m > p) {
m = msk[i];
- for (i = 0; i < 32; i++) {
- if (m & (1U << i) && ++o == p)
- break;
+ for (int j = 0; j < 32; j++) {
+ if (m & (1U << j)) {
+ if (o == p) {
+ o = i * 32 + j;
+ break;
+ }
+ o++;
+ }
}
break;
}
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2531,7 +2531,7 @@ log_load(const char *fn, logger *lg, cha
goto error;
}
if (!earlyexit) {
- /* in case or process-wal-and-exit, do NOT run
+ /* in case of process-wal-and-exit, do NOT run
* upgrade code, and therefore do NOT update WAL
* version number */
if (lg->postfuncp && (*lg->postfuncp) (lg->funcdata,
lg) != GDK_SUCCEED)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
