You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2011/02/11 12:14:52 UTC
svn commit: r1069751 - in /lucene/dev/branches/bulkpostings/lucene:
contrib/instantiated/src/java/org/apache/lucene/store/instantiated/
contrib/memory/src/java/org/apache/lucene/index/memory/
src/java/org/apache/lucene/index/ src/java/org/apache/lucene...
Author: mikemccand
Date: Fri Feb 11 11:14:52 2011
New Revision: 1069751
URL: http://svn.apache.org/viewvc?rev=1069751&view=rev
Log:
remove dead code now that we don't stuff terms dict metadata into the intblock stream
Modified:
lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedBulkPostingsEnum.java
lucene/dev/branches/bulkpostings/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/BulkPostingsEnum.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/MultiBulkPostingsEnum.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexInput.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/intblock/VariableIntBlockIndexInput.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/preflex/PreFlexFields.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsReaderImpl.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsReaderImpl.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsReader.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsReader.java
lucene/dev/branches/bulkpostings/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexInput.java
lucene/dev/branches/bulkpostings/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexOutput.java
lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/TestExternalCodecs.java
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedBulkPostingsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedBulkPostingsEnum.java?rev=1069751&r1=1069750&r2=1069751&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedBulkPostingsEnum.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedBulkPostingsEnum.java Fri Feb 11 11:14:52 2011
@@ -78,11 +78,6 @@ public class InstantiatedBulkPostingsEnu
}
@Override
- public void setOffset(int v) {
- throw new UnsupportedOperationException();
- }
-
- @Override
public int end() {
return limit;
}
@@ -128,11 +123,6 @@ public class InstantiatedBulkPostingsEnu
}
@Override
- public void setOffset(int v) {
- throw new UnsupportedOperationException();
- }
-
- @Override
public int end() {
return limit;
}
@@ -178,11 +168,6 @@ public class InstantiatedBulkPostingsEnu
}
@Override
- public void setOffset(int v) {
- throw new UnsupportedOperationException();
- }
-
- @Override
public int end() {
return limit;
}
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1069751&r1=1069750&r2=1069751&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Fri Feb 11 11:14:52 2011
@@ -1096,11 +1096,6 @@ public class MemoryIndex {
}
@Override
- public void setOffset(int offset) {
- throw new UnsupportedOperationException();
- }
-
- @Override
public int end() {
return 1;
}
@@ -1129,11 +1124,6 @@ public class MemoryIndex {
}
@Override
- public void setOffset(int offset) {
- throw new UnsupportedOperationException();
- }
-
- @Override
public int end() {
return 1;
}
@@ -1169,11 +1159,6 @@ public class MemoryIndex {
}
@Override
- public void setOffset(int offset) {
- throw new UnsupportedOperationException();
- }
-
- @Override
public int end() {
return limit;
}
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/BulkPostingsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/BulkPostingsEnum.java?rev=1069751&r1=1069750&r2=1069751&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/BulkPostingsEnum.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/BulkPostingsEnum.java Fri Feb 11 11:14:52 2011
@@ -76,9 +76,6 @@ public abstract class BulkPostingsEnum {
* you should not call this method anymore (the offset
* is always 0). */
public abstract int offset();
-
- // nocommit messy
- public abstract void setOffset(int offset);
}
public abstract BlockReader getDocDeltasReader() throws IOException;
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/MultiBulkPostingsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/MultiBulkPostingsEnum.java?rev=1069751&r1=1069750&r2=1069751&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/MultiBulkPostingsEnum.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/MultiBulkPostingsEnum.java Fri Feb 11 11:14:52 2011
@@ -73,11 +73,6 @@ public final class MultiBulkPostingsEnum
}
@Override
- public void setOffset(int offset) {
- assert offset == 0;
- }
-
- @Override
public int end() {
return currentEnd;
}
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexInput.java?rev=1069751&r1=1069750&r2=1069751&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexInput.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/intblock/FixedIntBlockIndexInput.java Fri Feb 11 11:14:52 2011
@@ -122,11 +122,6 @@ public abstract class FixedIntBlockIndex
}
@Override
- public void setOffset(int offset) {
- this.offset = offset;
- }
-
- @Override
public int fill() throws IOException {
//System.out.println("fii.fill seekPending=" + seekPending + " set lastFP=" + pendingFP + " this=" + this);
// nocommit -- not great that we do this on each
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/intblock/VariableIntBlockIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/intblock/VariableIntBlockIndexInput.java?rev=1069751&r1=1069750&r2=1069751&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/intblock/VariableIntBlockIndexInput.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/intblock/VariableIntBlockIndexInput.java Fri Feb 11 11:14:52 2011
@@ -140,11 +140,6 @@ public abstract class VariableIntBlockIn
}
@Override
- public void setOffset(int offset) {
- this.offset = offset;
- }
-
- @Override
public int fill() throws IOException {
// nocommit -- not great that we do this on each
// fill -- but we need it to detect seek w/in block
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/preflex/PreFlexFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/preflex/PreFlexFields.java?rev=1069751&r1=1069750&r2=1069751&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/preflex/PreFlexFields.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/preflex/PreFlexFields.java Fri Feb 11 11:14:52 2011
@@ -1274,11 +1274,6 @@ public class PreFlexFields extends Field
public int offset() {
return 0;
}
-
- @Override
- public void setOffset(int offset) {
- throw new UnsupportedOperationException();
- }
}
class FreqsReader extends BulkPostingsEnum.BlockReader {
@@ -1308,11 +1303,6 @@ public class PreFlexFields extends Field
public int offset() {
return 0;
}
-
- @Override
- public void setOffset(int offset) {
- throw new UnsupportedOperationException();
- }
}
class PositionsReader extends BulkPostingsEnum.BlockReader {
@@ -1361,11 +1351,6 @@ public class PreFlexFields extends Field
public int offset() {
return 0;
}
-
- @Override
- public void setOffset(int offset) {
- assert offset == 0;
- }
}
@Override
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsReaderImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsReaderImpl.java?rev=1069751&r1=1069750&r2=1069751&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsReaderImpl.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsReaderImpl.java Fri Feb 11 11:14:52 2011
@@ -482,11 +482,6 @@ public class PulsingPostingsReaderImpl e
}
@Override
- public void setOffset(int offset) {
- assert offset == 0;
- }
-
- @Override
public int end() {
return docDeltas.length;
}
@@ -514,11 +509,6 @@ public class PulsingPostingsReaderImpl e
}
@Override
- public void setOffset(int offset) {
- assert offset == 0;
- }
-
- @Override
public int end() {
return numDocs;
}
@@ -546,11 +536,6 @@ public class PulsingPostingsReaderImpl e
}
@Override
- public void setOffset(int offset) {
- assert offset == 0;
- }
-
- @Override
public int end() {
return positionDeltas.length;
}
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsReaderImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsReaderImpl.java?rev=1069751&r1=1069750&r2=1069751&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsReaderImpl.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsReaderImpl.java Fri Feb 11 11:14:52 2011
@@ -946,11 +946,6 @@ public class SepPostingsReaderImpl exten
}
@Override
- public void setOffset(int offset) {
- throw new UnsupportedOperationException();
- }
-
- @Override
public int fill() throws IOException {
// Translate code back to pos deltas, and filter out
// any changes in payload length. NOTE: this is a
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsReader.java?rev=1069751&r1=1069750&r2=1069751&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsReader.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsReader.java Fri Feb 11 11:14:52 2011
@@ -517,11 +517,6 @@ class SimpleTextFieldsReader extends Fie
}
@Override
- public void setOffset(int offset) {
- assert offset == 0;
- }
-
- @Override
public int end() {
return limit;
}
@@ -573,11 +568,6 @@ class SimpleTextFieldsReader extends Fie
}
@Override
- public void setOffset(int offset) {
- assert offset == 0;
- }
-
- @Override
public int end() {
return limit;
}
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsReader.java?rev=1069751&r1=1069750&r2=1069751&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsReader.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/standard/StandardPostingsReader.java Fri Feb 11 11:14:52 2011
@@ -21,11 +21,9 @@ import java.io.IOException;
import java.util.Collection;
import org.apache.lucene.index.DocsAndPositionsEnum;
-import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.BulkPostingsEnum;
-import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.index.TermState;
@@ -1000,11 +998,6 @@ public class StandardPostingsReader exte
public int offset() {
return 0;
}
-
- @Override
- public void setOffset(int offset) {
- throw new UnsupportedOperationException();
- }
}
class FreqsReader extends BulkPostingsEnum.BlockReader {
@@ -1034,11 +1027,6 @@ public class StandardPostingsReader exte
public int offset() {
return 0;
}
-
- @Override
- public void setOffset(int offset) {
- throw new UnsupportedOperationException();
- }
}
class PositionsReader extends BulkPostingsEnum.BlockReader {
@@ -1084,11 +1072,6 @@ public class StandardPostingsReader exte
public int offset() {
return 0;
}
-
- @Override
- public void setOffset(int offset) {
- throw new UnsupportedOperationException();
- }
}
@Override
Modified: lucene/dev/branches/bulkpostings/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexInput.java?rev=1069751&r1=1069750&r2=1069751&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexInput.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexInput.java Fri Feb 11 11:14:52 2011
@@ -75,11 +75,6 @@ public class MockSingleIntIndexInput ext
}
@Override
- public void setOffset(int offset) {
- this.offset = offset;
- }
-
- @Override
public int end() {
return 1;
}
Modified: lucene/dev/branches/bulkpostings/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexOutput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexOutput.java?rev=1069751&r1=1069750&r2=1069751&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexOutput.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexOutput.java Fri Feb 11 11:14:52 2011
@@ -77,7 +77,7 @@ public class MockSingleIntIndexOutput ex
}
lastFP = fp;
}
-
+
@Override
public String toString() {
return Long.toString(fp);
Modified: lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/TestExternalCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/TestExternalCodecs.java?rev=1069751&r1=1069750&r2=1069751&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/TestExternalCodecs.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/TestExternalCodecs.java Fri Feb 11 11:14:52 2011
@@ -456,11 +456,6 @@ public class TestExternalCodecs extends
public int offset() {
return 0;
}
-
- @Override
- public void setOffset(int offset) {
- throw new UnsupportedOperationException();
- }
}
}