Changeset: 43167a57df43 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/43167a57df43
Modified Files:
gdk/gdk_aggr.c
Branch: default
Log Message:
In aggregates, the group bat should be aligned with the candidates.
diffs (27 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -69,10 +69,11 @@ BATgroupaggrinit(BAT *b, BAT *g, BAT *e,
if (b == NULL)
return "b must exist";
+ *ncand = canditer_init(ci, b, s);
if (g) {
- if (BATcount(b) != BATcount(g) ||
- (BATcount(b) != 0 && b->hseqbase != g->hseqbase))
- return "b and g must be aligned";
+ if (ci->ncand != BATcount(g) ||
+ (ci->ncand != 0 && ci->seq != g->hseqbase))
+ return "b with s and g must be aligned";
assert(BATttype(g) == TYPE_oid);
}
if (g == NULL) {
@@ -133,8 +134,6 @@ BATgroupaggrinit(BAT *b, BAT *g, BAT *e,
*maxp = max;
*ngrpp = ngrp;
- *ncand = canditer_init(ci, b, s);
-
return NULL;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
