Changeset: 7da005558152 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7da005558152
Modified Files:
gdk/gdk_select.c
Branch: Apr2019
Log Message:
Fix for anti-select with imprints on columns with nils: nils are in bin #0.
diffs (22 lines):
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -329,7 +329,7 @@ hashselect(BAT *b, BAT *s, BAT *bn, cons
/* the following does work, however */ \
mask = (((((uint##B##_t) 1 << hbin) - 1) << 1) | 1) -
(((uint##B##_t) 1 << lbin) - 1); \
innermask = mask; \
- if (!b->tnonil || vl != minval) \
+ if (vl != minval) \
innermask = IMPSunsetBit(B, innermask, lbin); \
if (vh != maxval) \
innermask = IMPSunsetBit(B, innermask, hbin); \
@@ -338,6 +338,9 @@ hashselect(BAT *b, BAT *s, BAT *bn, cons
mask = ~innermask; \
innermask = ~tmp; \
} \
+ /* if there are nils, we may need to check bin 0 */ \
+ if (!b->tnonil) \
+ innermask = IMPSunsetBit(B, innermask, 0); \
\
if (BATcapacity(bn) < maximum) { \
impsloop(CAND, TEST, \
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
