Changeset: f6a2f2875cef for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f6a2f2875cef
Modified Files:
gdk/gdk_batop.c
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (30 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1328,8 +1328,8 @@ BATsubsort(BAT **sorted, BAT **order, BA
if (on == NULL)
goto error;
BATsetcount(on, BATcount(b));
- BATseqbase(on, 0);
- BATseqbase(BATmirror(on), 0);
+ BATseqbase(on, b->hseqbase);
+ BATseqbase(BATmirror(on), b->hseqbase);
*order = on;
}
if (groups) {
@@ -1387,13 +1387,13 @@ BATsubsort(BAT **sorted, BAT **order, BA
goto error;
grps = (oid *) Tloc(on, BUNfirst(on));
for (p = 0, q = BATcount(bn); p < q; p++)
- grps[p] = p;
+ grps[p] = p + b->hseqbase;
BATsetcount(on, BATcount(bn));
on->tkey = 1;
on->T->nil = 0;
on->T->nonil = 1;
}
- BATseqbase(on, 0);
+ BATseqbase(on, b->hseqbase);
on->tsorted = on->trevsorted = 0; /* it won't be sorted */
on->tdense = 0; /* and hence not dense */
*order = on;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
