Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-3892: inline scanning after DocsEnum.advance 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/pforcodec_3892@1369703 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2012-08-05 23:33:00 +00:00
parent de9586104c
commit d4c27acb1a
1 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lucene/core/src/java/org/apache/lucene/codecs/block/BlockPostingsReader.java
View File

@ -295,10 +295,10 @@ public final class BlockPostingsReader extends PostingsReaderBase {
throws IOException {
boolean indexHasOffsets = fieldInfo.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) >= 0;
boolean indexHasPayloasd = fieldInfo.hasPayloads();
boolean indexHasPayloads = fieldInfo.hasPayloads();
if ((!indexHasOffsets || (flags & DocsAndPositionsEnum.FLAG_OFFSETS) == 0) &&
(!fieldInfo.hasPayloads() || (flags & DocsAndPositionsEnum.FLAG_PAYLOADS) == 0)) {
(!indexHasPayloads || (flags & DocsAndPositionsEnum.FLAG_PAYLOADS) == 0)) {
BlockDocsAndPositionsEnum docsAndPositionsEnum;
if (reuse instanceof BlockDocsAndPositionsEnum) {
docsAndPositionsEnum = (BlockDocsAndPositionsEnum) reuse;
@ -521,19 +521,43 @@ public final class BlockPostingsReader extends PostingsReaderBase {
}
}
// Now scan:
while (nextDoc() != NO_MORE_DOCS) {
if (doc >= target) {
if (DEBUG) {
System.out.println(" advance return doc=" + doc);
}
return doc;
// Now scan... this is an inlined/pared down version
// of nextDoc():
while (true) {
if (DEBUG) {
System.out.println(" scan doc=" + accum + " docBufferUpto=" + docBufferUpto);
}
if (docUpto == docFreq) {
return doc = NO_MORE_DOCS;
}
if (docBufferUpto == blockSize) {
// nocommit hmm skip freq? but: we don't ever
// scan over more than one block?
refillDocs();
}
accum += docDeltaBuffer[docBufferUpto];
docUpto++;
if (accum >= target) {
break;
}
docBufferUpto++;
}
if (DEBUG) {
System.out.println(" advance return doc=END");
if (liveDocs == null || liveDocs.get(accum)) {
if (DEBUG) {
System.out.println(" return doc=" + accum);
}
freq = freqBuffer[docBufferUpto];
docBufferUpto++;
return doc = accum;
} else {
if (DEBUG) {
System.out.println(" now do nextDoc()");
}
docBufferUpto++;
return nextDoc();
}
return NO_MORE_DOCS;
}
}
@ -809,6 +833,8 @@ public final class BlockPostingsReader extends PostingsReaderBase {
}
}
// nocommit inline nextDoc here
// Now scan:
while (nextDoc() != NO_MORE_DOCS) {
if (doc >= target) {
@ -1281,6 +1307,8 @@ public final class BlockPostingsReader extends PostingsReaderBase {
}
}
// nocommit inline nextDoc here
// Now scan:
while (nextDoc() != NO_MORE_DOCS) {
if (doc >= target) {