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

LUCENE-4283: check next skip point to see if it's worth invoking skipper 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/pforcodec_3892@1370534 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2012-08-07 21:26:14 +00:00
parent 9d7cb7de69
commit eab777c3d3
4 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java
View File

@ -59,7 +59,7 @@ public abstract class MultiLevelSkipListReader {
private int skipInterval[]; // skipInterval of each level
private int[] numSkipped; // number of docs skipped per level
private int[] skipDoc; // doc id of current skip entry per level
protected int[] skipDoc; // doc id of current skip entry per level
private int lastDoc; // doc id of last read skip entry with docId <= target
private long[] childPointer; // child pointer of current skip entry per level
private long lastChildPointer; // childPointer of last read skip entry with docId <= target

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

@ -355,6 +355,10 @@ public final class BlockPostingsReader extends PostingsReaderBase {
// no skip data for this term):
private int skipOffset;
// docID for next skip point, we won't use skipper if
// target docID is not larger than this
private int nextSkipDoc;
private Bits liveDocs;
public BlockDocsEnum(FieldInfo fieldInfo) throws IOException {
@ -391,6 +395,7 @@ public final class BlockPostingsReader extends PostingsReaderBase {
}
accum = 0;
docUpto = 0;
nextSkipDoc = BLOCK_SIZE - 1; // we won't skip if target is found in first block
docBufferUpto = BLOCK_SIZE;
skipped = false;
return this;
@ -475,10 +480,13 @@ public final class BlockPostingsReader extends PostingsReaderBase {
@Override
public int advance(int target) throws IOException {
// nocommit make frq block load lazy/skippable
if (DEBUG) {
System.out.println(" FPR.advance target=" + target);
}
// nocommit use skipper!!! it has next last doc id!!
if (docFreq > BLOCK_SIZE && target - accum > BLOCK_SIZE) {
// current skip docID < docIDs generated from current buffer <= next skip docID
// we don't need to skip if target is buffered already
if (docFreq > BLOCK_SIZE && target > nextSkipDoc) {
if (DEBUG) {
System.out.println("load skipper");
@ -517,6 +525,7 @@ public final class BlockPostingsReader extends PostingsReaderBase {
accum = skipper.getDoc(); // actually, this is just lastSkipEntry
docIn.seek(skipper.getDocPointer()); // now point to the block we want to search
}
nextSkipDoc = skipper.getNextSkipDoc();
}
// Now scan... this is an inlined/pared down version
@ -622,6 +631,8 @@ public final class BlockPostingsReader extends PostingsReaderBase {
// no skip data for this term):
private int skipOffset;
private int nextSkipDoc;
private Bits liveDocs;
public BlockDocsAndPositionsEnum(FieldInfo fieldInfo) throws IOException {
@ -664,6 +675,7 @@ public final class BlockPostingsReader extends PostingsReaderBase {
doc = -1;
accum = 0;
docUpto = 0;
nextSkipDoc = BLOCK_SIZE - 1;
docBufferUpto = BLOCK_SIZE;
skipped = false;
return this;
@ -783,11 +795,7 @@ public final class BlockPostingsReader extends PostingsReaderBase {
System.out.println(" FPR.advance target=" + target);
}
// nocommit 2 is heuristic guess!!
// nocommit put cheating back! does it help?
// nocommit use skipper!!! it has next last doc id!!
//if (docFreq > BLOCK_SIZE && target - (BLOCK_SIZE - docBufferUpto) - 2*BLOCK_SIZE > accum) {
if (docFreq > BLOCK_SIZE && target - accum > BLOCK_SIZE) {
if (docFreq > BLOCK_SIZE && target > nextSkipDoc) {
if (DEBUG) {
System.out.println(" try skipper");
}
@ -833,6 +841,7 @@ public final class BlockPostingsReader extends PostingsReaderBase {
posPendingFP = skipper.getPosPointer();
posPendingCount = skipper.getPosBufferUpto();
}
nextSkipDoc = skipper.getNextSkipDoc();
}
// Now scan... this is an inlined/pared down version
@ -1047,6 +1056,8 @@ public final class BlockPostingsReader extends PostingsReaderBase {
// no skip data for this term):
private int skipOffset;
private int nextSkipDoc;
private Bits liveDocs;
public EverythingEnum(FieldInfo fieldInfo) throws IOException {
@ -1110,6 +1121,7 @@ public final class BlockPostingsReader extends PostingsReaderBase {
doc = -1;
accum = 0;
docUpto = 0;
nextSkipDoc = BLOCK_SIZE - 1;
docBufferUpto = BLOCK_SIZE;
skipped = false;
return this;
@ -1278,11 +1290,7 @@ public final class BlockPostingsReader extends PostingsReaderBase {
System.out.println(" FPR.advance target=" + target);
}
// nocommit 2 is heuristic guess!!
// nocommit put cheating back! does it help?
// nocommit use skipper!!! it has next last doc id!!
//if (docFreq > BLOCK_SIZE && target - (BLOCK_SIZE - docBufferUpto) - 2*BLOCK_SIZE > accum) {
if (docFreq > BLOCK_SIZE && target - accum > BLOCK_SIZE) {
if (docFreq > BLOCK_SIZE && target > nextSkipDoc) {
if (DEBUG) {
System.out.println(" try skipper");
@ -1332,6 +1340,7 @@ public final class BlockPostingsReader extends PostingsReaderBase {
lastStartOffset = skipper.getStartOffset();
payloadByteUpto = skipper.getPayloadByteUpto();
}
nextSkipDoc = skipper.getNextSkipDoc();
}
// nocommit inline nextDoc here

4
lucene/core/src/java/org/apache/lucene/codecs/block/BlockSkipReader.java
View File

@ -152,6 +152,10 @@ final class BlockSkipReader extends MultiLevelSkipListReader {
return lastPayloadByteUpto;
}
public int getNextSkipDoc() {
return skipDoc[0];
}
@Override
protected void seekChild(int level) throws IOException {
super.seekChild(level);

5
lucene/core/src/java/org/apache/lucene/codecs/block/ForUtil.java
View File

@ -37,7 +37,7 @@ public final class ForUtil {
*
* @param data uncompressed data
* @param intBuffer integer buffer to hold compressed data
* @return the number of frame bits for current block
* @return the header for the current block
*/
static int compress(final int[] data, IntBuffer intBuffer) {
int numBits = getNumBits(data);
@ -54,7 +54,8 @@ public final class ForUtil {
}
/**
* Save only one int when the whole block equals to 1
* Save only one int when the whole block equals to a
* single value.
*/
static int compressDuplicateBlock(final int[] data, IntBuffer intBuffer) {
intBuffer.put(0, data[0]);