gibheer
/
bleve
0
0
Fork 0
Code

Merge pull request #852 from steveyen/scorch-zap-postingsIterator-allNChunk-bug 

PostingsIterator.nextDocNum() maintains allNChunk correctly
This commit is contained in:
Steve Yen 2018-03-22 13:26:14 -07:00 committed by GitHub
parent 7e32a35af5 b506fae4f7
commit a7c4237d00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
index/scorch/segment/zap/posting.go
View File

@ -316,11 +316,9 @@ func (rv *PostingsList) init1Hit(fstVal uint64) error {
// PostingsIterator provides a way to iterate through the postings list
type PostingsIterator struct {
postings *PostingsList
all roaring.IntIterable
offset int
locoffset int
actual roaring.IntIterable
postings *PostingsList
all roaring.IntIterable
actual roaring.IntIterable
currChunk uint32
currChunkFreqNorm []byte
@ -584,16 +582,12 @@ func (i *PostingsIterator) nextDocNum() (uint64, bool, error) {
nChunk := n / i.postings.sb.chunkFactor
allNChunk := allN / i.postings.sb.chunkFactor
// n is the next actual hit (excluding some postings)
// allN is the next hit in the full postings
// if they don't match, adjust offsets to factor in item we're skipping over
// incr the all iterator, and check again
// n is the next actual hit (excluding some postings), and
// allN is the next hit in the full postings, and
// if they don't match, move 'all' forwards until they do
for allN != n {
// in different chunks, reset offsets
if allNChunk != nChunk {
i.locoffset = 0
i.offset = 0
} else {
// in the same chunk, so move the freq/norm/loc decoders forward
if allNChunk == nChunk {
if i.currChunk != nChunk || i.currChunkFreqNorm == nil {
err := i.loadChunk(int(nChunk))
if err != nil {
@ -614,12 +608,10 @@ func (i *PostingsIterator) nextDocNum() (uint64, bool, error) {
}
}
}
// in same chunk, need to account for offsets
i.offset++
}
allN = i.all.Next()
allNChunk = allN / i.postings.sb.chunkFactor
}
if i.currChunk != nChunk || i.currChunkFreqNorm == nil {