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 2012/07/04 02:33:20 UTC
svn commit: r1357024 - in
/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs:
intblock/FixedIntBlockIndexInput.java
intblock/VariableIntBlockIndexInput.java sep/IntIndexInput.java
Author: mikemccand
Date: Wed Jul 4 00:33:19 2012
New Revision: 1357024
URL: http://svn.apache.org/viewvc?rev=1357024&view=rev
Log:
remove dead code
Modified:
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java?rev=1357024&r1=1357023&r2=1357024&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java Wed Jul 4 00:33:19 2012
@@ -87,14 +87,12 @@ public abstract class FixedIntBlockIndex
private long lastBlockFP;
private final BlockReader blockReader;
private final int blockSize;
- private final IntsRef bulkResult = new IntsRef();
public Reader(final IndexInput in, final int[] pending, final BlockReader blockReader)
throws IOException {
this.in = in;
this.pending = pending;
this.blockSize = pending.length;
- bulkResult.ints = pending;
this.blockReader = blockReader;
upto = blockSize;
}
@@ -129,25 +127,6 @@ public abstract class FixedIntBlockIndex
return pending[upto++];
}
-
- @Override
- public IntsRef read(final int count) throws IOException {
- this.maybeSeek();
- if (upto == blockSize) {
- blockReader.readBlock();
- upto = 0;
- }
- bulkResult.offset = upto;
- if (upto + count < blockSize) {
- bulkResult.length = count;
- upto += count;
- } else {
- bulkResult.length = blockSize - upto;
- upto = blockSize;
- }
-
- return bulkResult;
- }
}
private class Index extends IntIndexInput.Index {
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java?rev=1357024&r1=1357023&r2=1357024&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java Wed Jul 4 00:33:19 2012
@@ -90,13 +90,11 @@ public abstract class VariableIntBlockIn
private long lastBlockFP;
private int blockSize;
private final BlockReader blockReader;
- private final IntsRef bulkResult = new IntsRef();
public Reader(final IndexInput in, final int[] pending, final BlockReader blockReader)
throws IOException {
this.in = in;
this.pending = pending;
- bulkResult.ints = pending;
this.blockReader = blockReader;
}
@@ -147,26 +145,6 @@ public abstract class VariableIntBlockIn
return pending[upto++];
}
-
- @Override
- public IntsRef read(final int count) throws IOException {
- this.maybeSeek();
- if (upto == blockSize) {
- lastBlockFP = in.getFilePointer();
- blockSize = blockReader.readBlock();
- upto = 0;
- }
- bulkResult.offset = upto;
- if (upto + count < blockSize) {
- bulkResult.length = count;
- upto += count;
- } else {
- bulkResult.length = blockSize - upto;
- upto = blockSize;
- }
-
- return bulkResult;
- }
}
private class Index extends IntIndexInput.Index {
Modified: lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java?rev=1357024&r1=1357023&r2=1357024&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java Wed Jul 4 00:33:19 2012
@@ -54,23 +54,5 @@ public abstract class IntIndexInput impl
/** Reads next single int */
public abstract int next() throws IOException;
-
- /** Reads next chunk of ints */
- private IntsRef bulkResult;
-
- /** Read up to count ints. */
- public IntsRef read(int count) throws IOException {
- if (bulkResult == null) {
- bulkResult = new IntsRef();
- bulkResult.ints = new int[count];
- } else {
- bulkResult.grow(count);
- }
- for(int i=0;i<count;i++) {
- bulkResult.ints[i] = next();
- }
- bulkResult.length = count;
- return bulkResult;
- }
}
}