Changeset: c5e51a111670 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c5e51a111670
Modified Files:
monetdb5/modules/atoms/batxml.c
Branch: Feb2013
Log Message:
Previous change (f1f66b64f0bc) contained thinko: fix for dense-tailed groups.
diffs (52 lines):
diff --git a/monetdb5/modules/atoms/batxml.c b/monetdb5/modules/atoms/batxml.c
--- a/monetdb5/modules/atoms/batxml.c
+++ b/monetdb5/modules/atoms/batxml.c
@@ -1446,6 +1446,13 @@ BATxmlaggr(BAT **bnp, BAT *b, BAT *g, BA
}
}
}
+ if (g && BATtdense(g)) {
+ /* singleton groups: return group ID's (g's tail) and original
+ * values from b */
+ bn = VIEWcreate(BATmirror(g), b);
+ goto out;
+ }
+
maxlen = BUFSIZ;
if ((buf = GDKmalloc(maxlen)) == NULL) {
err = MAL_MALLOC_FAIL;
@@ -1458,7 +1465,7 @@ BATxmlaggr(BAT **bnp, BAT *b, BAT *g, BA
goto out;
}
bi = bat_iterator(b);
- if (g && !BATtdense(g) && BATcount(g) > 0) {
+ if (g) {
/* stable sort g */
if (BATsubsort(&t1, &t2, NULL, g, NULL, NULL, 0, 1) ==
GDK_FAIL) {
BBPreclaim(bn);
@@ -1533,24 +1540,7 @@ BATxmlaggr(BAT **bnp, BAT *b, BAT *g, BA
BBPunfix(t2->batCacheid);
t2 = NULL;
} else {
- if (g) {
- if (BATcount(g) == 0) {
- p = q = 0;
- } else {
- p = g->tseqbase;
- q = p + BATcount(g);
- }
- if (p < b->hseqbase)
- p = b->hseqbase;
- if (q > b->hseqbase + BATcount(b))
- q = b->hseqbase + BATcount(b);
- p -= b->hseqbase;
- q -= b->hseqbase;
- } else {
- p = 0;
- q = BATcount(b);
- }
- for (p += BUNfirst(b), q += BUNfirst(b); p < q; p++) {
+ for (p = BUNfirst(b), q = p + BATcount(b); p < q; p++) {
v = (const char *) BUNtail(bi, p);
if (strNil(v)) {
if (skip_nils)
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
