Changeset: d9905990d720 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d9905990d720
Modified Files:
gdk/gdk_select.c
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (16 lines):
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -184,10 +184,10 @@ BAT_hashselect(BAT *b, BAT *s, BAT *bn,
if (s && BATtdense(s)) {
/* no need for binary search in s, we just adjust the
* boundaries */
+ if (s->tseqbase + BATcount(s) < seq + (h - l))
+ h -= seq + (h - l) - (s->tseqbase + BATcount(s));
if (s->tseqbase > seq)
l += s->tseqbase - seq;
- if (s->tseqbase + BATcount(s) < seq + (h - l))
- h -= seq + BATcount(b) - (s->tseqbase + BATcount(s));
s = NULL;
}
if (BATprepareHash(b)) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
