Changeset: fbe2e6413b98 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fbe2e6413b98
Modified Files:
monetdb5/modules/mal/chopper.c
Branch: Jul2012
Log Message:
Backported fix from default branch: seqbase must be within range.
diffs (21 lines):
diff --git a/monetdb5/modules/mal/chopper.c b/monetdb5/modules/mal/chopper.c
--- a/monetdb5/modules/mal/chopper.c
+++ b/monetdb5/modules/mal/chopper.c
@@ -98,7 +98,7 @@ CHPnewChunkIterator(lng *res, int *vid,
/* printf("set bat chunk bound to " LLFMT " " BUNFMT " - " BUNFMT "\n",
*granule, first, MIN(cnt,(BUN) *granule)); */
VIEWbounds(b, view, (BUN) first, first + MIN(cnt, (BUN) * granule));
- BATseqbase(view, first - 1);
+ BATseqbase(view, b->hseqbase);
*vid = view->batCacheid;
BBPkeepref(view->batCacheid);
BBPunfix(b->batCacheid);
@@ -136,7 +136,7 @@ CHPhasMoreElements(lng *res, int *vid, i
/* printf("set bat chunk bound to " BUNFMT " - " BUNFMT " \n",
i, i+(BUN) *granule-1); */
VIEWbounds(b, view, i, i + (BUN) * granule);
- BATseqbase(view, i - 1);
+ BATseqbase(view, b->hseqbase == oid_nil ? oid_nil : b->hseqbase + i -
BUNfirst(b));
BBPunfix(b->batCacheid);
BBPkeepref(*vid = view->batCacheid);
*res = i;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
