Changeset: fc5c39d27c4d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fc5c39d27c4d
Modified Files:
gdk/gdk_cand.c
Branch: pushcands
Log Message:
Fix canditer_search for mask candidate lists.
diffs (12 lines):
diff --git a/gdk/gdk_cand.c b/gdk/gdk_cand.c
--- a/gdk/gdk_cand.c
+++ b/gdk/gdk_cand.c
@@ -1023,7 +1023,7 @@ canditer_search(const struct canditer *c
if (p == ci->nvals - 1 && o >= ci->lastbit)
return next ? ci->ncand : BUN_NONE;
if (next || ci->mask[p] & (1U << o))
- return count_mask_bits(ci, 0, p) + (o == 0 ? 0 :
candmask_pop(ci->mask[p] << (32 - o))) + !(ci->mask[p] & (1U << o));
+ return count_mask_bits(ci, 0, p * 32 + o) +
!(ci->mask[p] & (1U << o));
break;
}
return BUN_NONE;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
