You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/07/10 05:40:16 UTC
svn commit: r1144768 -
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryCodec.java
Author: rmuir
Date: Sun Jul 10 03:40:16 2011
New Revision: 1144768
URL: http://svn.apache.org/viewvc?rev=1144768&view=rev
Log:
remove dead code
Modified:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryCodec.java
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryCodec.java?rev=1144768&r1=1144767&r2=1144768&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryCodec.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryCodec.java Sun Jul 10 03:40:16 2011
@@ -372,7 +372,6 @@ public class MemoryCodec extends Codec {
}
private final static class FSTDocsAndPositionsEnum extends DocsAndPositionsEnum {
- private final boolean omitTFAP;
private final boolean storePayloads;
private byte[] buffer = new byte[16];
private final ByteArrayDataInput in = new ByteArrayDataInput(buffer);
@@ -389,13 +388,12 @@ public class MemoryCodec extends Codec {
private int pos;
private final BytesRef payload = new BytesRef();
- public FSTDocsAndPositionsEnum(boolean omitTFAP, boolean storePayloads) {
- this.omitTFAP = omitTFAP;
+ public FSTDocsAndPositionsEnum(boolean storePayloads) {
this.storePayloads = storePayloads;
}
- public boolean canReuse(boolean omitTFAP, boolean storePayloads) {
- return omitTFAP == this.omitTFAP && storePayloads == this.storePayloads;
+ public boolean canReuse(boolean storePayloads) {
+ return storePayloads == this.storePayloads;
}
public FSTDocsAndPositionsEnum reset(BytesRef bufferIn, Bits liveDocs, int numDocs) {
@@ -434,18 +432,14 @@ public class MemoryCodec extends Codec {
return docID = NO_MORE_DOCS;
}
docUpto++;
- if (omitTFAP) {
- docID += in.readVInt();
+
+ final int code = in.readVInt();
+ docID += code >>> 1;
+ if ((code & 1) != 0) {
freq = 1;
} else {
- final int code = in.readVInt();
- docID += code >>> 1;
- if ((code & 1) != 0) {
- freq = 1;
- } else {
- freq = in.readVInt();
- assert freq > 0;
- }
+ freq = in.readVInt();
+ assert freq > 0;
}
if (liveDocs == null || liveDocs.get(docID)) {
@@ -460,8 +454,8 @@ public class MemoryCodec extends Codec {
if (!storePayloads) {
in.readVInt();
} else {
- final int code = in.readVInt();
- if ((code & 1) != 0) {
+ final int codeSkip = in.readVInt();
+ if ((codeSkip & 1) != 0) {
payloadLength = in.readVInt();
if (VERBOSE) System.out.println(" new payloadLen=" + payloadLength);
}
@@ -622,11 +616,11 @@ public class MemoryCodec extends Codec {
decodeMetaData();
FSTDocsAndPositionsEnum docsAndPositionsEnum;
if (reuse == null || !(reuse instanceof FSTDocsAndPositionsEnum)) {
- docsAndPositionsEnum = new FSTDocsAndPositionsEnum(field.omitTermFreqAndPositions, field.storePayloads);
+ docsAndPositionsEnum = new FSTDocsAndPositionsEnum(field.storePayloads);
} else {
docsAndPositionsEnum = (FSTDocsAndPositionsEnum) reuse;
- if (!docsAndPositionsEnum.canReuse(field.omitTermFreqAndPositions, field.storePayloads)) {
- docsAndPositionsEnum = new FSTDocsAndPositionsEnum(field.omitTermFreqAndPositions, field.storePayloads);
+ if (!docsAndPositionsEnum.canReuse(field.storePayloads)) {
+ docsAndPositionsEnum = new FSTDocsAndPositionsEnum(field.storePayloads);
}
}
if (VERBOSE) System.out.println("D&P reset this=" + this);