Changeset: a279505638f4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a279505638f4 Modified Files: monetdb5/modules/mal/Tests/iterator03.stable.out monetdb5/modules/mal/iterator.c Branch: default Log Message:
Fix iterator seqbase. diffs (57 lines): diff --git a/monetdb5/modules/mal/Tests/iterator03.stable.out b/monetdb5/modules/mal/Tests/iterator03.stable.out --- a/monetdb5/modules/mal/Tests/iterator03.stable.out +++ b/monetdb5/modules/mal/Tests/iterator03.stable.out @@ -55,24 +55,24 @@ end main; #---------------------------------------------------------# # h t # name # void url # type -#-------------------------------------------------------------------------# -[ 18446744073709551615@0, "http://www.cwi.nl"; ] -[ 0@0, "http://www.cwi.nl/~monet"; ] -[ 1@0, "http://www.cwi.nl/~mk/Acoi/doc/features.html"; ] +#---------------------------------------------------------# +[ 0@0, "http://www.cwi.nl"; ] +[ 1@0, "http://www.cwi.nl/~monet"; ] +[ 2@0, "http://www.cwi.nl/~mk/Acoi/doc/features.html"; ] [ "next chunk" ] #-------------------------------------------------------------------------# # h t # name # int url # type #-------------------------------------------------------------------------# -[ 2@0, "http://www.educ.uva.nl/schoolweb/rocloka.htm"; ] -[ 3@0, "http://www.nedstat.nl/cgi-bin/viewstat?name=Planetarium"; ] -[ 4@0, "http://www.edgeonline.com/"; ] +[ 3@0, "http://www.educ.uva.nl/schoolweb/rocloka.htm"; ] +[ 4@0, "http://www.nedstat.nl/cgi-bin/viewstat?name=Planetarium"; ] +[ 5@0, "http://www.edgeonline.com/"; ] [ "next chunk" ] #-------------------------------------------------# # h t # name # int url # type #-------------------------------------------------# -[ 5@0, "http://robotics.stanford.edu/icons/ " ] +[ 6@0, "http://robotics.stanford.edu/icons/ " ] # 00:03:53 > # 00:03:53 > Done. diff --git a/monetdb5/modules/mal/iterator.c b/monetdb5/modules/mal/iterator.c --- a/monetdb5/modules/mal/iterator.c +++ b/monetdb5/modules/mal/iterator.c @@ -71,7 +71,7 @@ ITRnewChunk(lng *res, int *vid, int *bid /* 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); @@ -108,7 +108,7 @@ ITRnextChunk(lng *res, int *vid, int *bi /* 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)); BBPkeepref(*vid = view->batCacheid); BBPunfix(b->batCacheid); *res = i; _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
