You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/08/21 10:23:46 UTC
svn commit: r1375429 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/codecs/
lucene/core/src/java/org/apache/lucene/codecs/intblock/
lucene/core/src/java/org/apache/lucene/codecs/lucene3x/ lucene/core...
Author: uschindler
Date: Tue Aug 21 08:23:44 2012
New Revision: 1375429
URL: http://svn.apache.org/viewvc?rev=1375429&view=rev
Log:
Merged revision(s) 1375428 from lucene/dev/trunk:
Improve Javadocs of IndexInput/IndexOutput. Remove useless casting when acquiring clones of IndexInput
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/VariableGapTermsIndexReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermDocs.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermEnum.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermPositions.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/Bytes.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/PackedIntValues.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarSortedBytesImpl.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPerDocProducer.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/DataInput.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/DataOutput.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/Directory.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/IndexInput.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/IndexOutput.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCompoundFile.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestCopyBytes.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java
lucene/dev/branches/branch_4x/lucene/facet/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/util/SlowRAMDirectory.java
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/mocksep/MockSingleIntIndexInput.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexInputWrapper.java
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java Tue Aug 21 08:23:44 2012
@@ -308,7 +308,7 @@ public class BlockTermsReader extends Fi
private int metaDataUpto;
public SegmentTermsEnum() throws IOException {
- in = (IndexInput) BlockTermsReader.this.in.clone();
+ in = BlockTermsReader.this.in.clone();
in.seek(termsStartPointer);
indexEnum = indexReader.getFieldEnum(fieldInfo);
doOrd = indexReader.supportsOrd();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java Tue Aug 21 08:23:44 2012
@@ -400,7 +400,7 @@ public class BlockTreeTermsReader extend
rootBlockFP = (new ByteArrayDataInput(rootCode.bytes, rootCode.offset, rootCode.length)).readVLong() >>> BlockTreeTermsWriter.OUTPUT_FLAGS_NUM_BITS;
if (indexIn != null) {
- final IndexInput clone = (IndexInput) indexIn.clone();
+ final IndexInput clone = indexIn.clone();
//System.out.println("start=" + indexStartFP + " field=" + fieldInfo.name);
clone.seek(indexStartFP);
index = new FST<BytesRef>(clone, ByteSequenceOutputs.getSingleton());
@@ -746,7 +746,7 @@ public class BlockTreeTermsReader extend
// }
runAutomaton = compiled.runAutomaton;
compiledAutomaton = compiled;
- in = (IndexInput) BlockTreeTermsReader.this.in.clone();
+ in = BlockTreeTermsReader.this.in.clone();
stack = new Frame[5];
for(int idx=0;idx<stack.length;idx++) {
stack[idx] = new Frame(idx);
@@ -1236,7 +1236,7 @@ public class BlockTreeTermsReader extend
// Not private to avoid synthetic access$NNN methods
void initIndexInput() {
if (this.in == null) {
- this.in = (IndexInput) BlockTreeTermsReader.this.in.clone();
+ this.in = BlockTreeTermsReader.this.in.clone();
}
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java Tue Aug 21 08:23:44 2012
@@ -278,7 +278,7 @@ public class FixedGapTermsIndexReader ex
this.termsStart = termsStart;
termBytesStart = termBytes.getPointer();
- IndexInput clone = (IndexInput) in.clone();
+ IndexInput clone = in.clone();
clone.seek(indexStart);
// -1 is passed to mean "don't load term index", but
@@ -309,8 +309,8 @@ public class FixedGapTermsIndexReader ex
}
} else {
// Get packed iterators
- final IndexInput clone1 = (IndexInput) in.clone();
- final IndexInput clone2 = (IndexInput) in.clone();
+ final IndexInput clone1 = in.clone();
+ final IndexInput clone2 = in.clone();
try {
// Subsample the index terms
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java Tue Aug 21 08:23:44 2012
@@ -208,7 +208,7 @@ public abstract class MultiLevelSkipList
toBuffer--;
} else {
// clone this stream, it is already at the start of the current level
- skipStream[i] = (IndexInput) skipStream[0].clone();
+ skipStream[i] = skipStream[0].clone();
if (inputIsBuffered && length < BufferedIndexInput.BUFFER_SIZE) {
((BufferedIndexInput) skipStream[i]).setBufferSize((int) length);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/VariableGapTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/VariableGapTermsIndexReader.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/VariableGapTermsIndexReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/VariableGapTermsIndexReader.java Tue Aug 21 08:23:44 2012
@@ -170,7 +170,7 @@ public class VariableGapTermsIndexReader
private void loadTermsIndex() throws IOException {
if (fst == null) {
- IndexInput clone = (IndexInput) in.clone();
+ IndexInput clone = in.clone();
clone.seek(indexStart);
fst = new FST<Long>(clone, fstOutputs);
clone.close();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java Tue Aug 21 08:23:44 2012
@@ -49,7 +49,7 @@ public abstract class FixedIntBlockIndex
@Override
public Reader reader() throws IOException {
final int[] buffer = new int[blockSize];
- final IndexInput clone = (IndexInput) in.clone();
+ final IndexInput clone = in.clone();
// TODO: can this be simplified?
return new Reader(clone, buffer, this.getBlockReader(clone, buffer));
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java Tue Aug 21 08:23:44 2012
@@ -51,7 +51,7 @@ public abstract class VariableIntBlockIn
@Override
public Reader reader() throws IOException {
final int[] buffer = new int[maxBlockSize];
- final IndexInput clone = (IndexInput) in.clone();
+ final IndexInput clone = in.clone();
// TODO: can this be simplified?
return new Reader(clone, buffer, this.getBlockReader(clone, buffer));
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java Tue Aug 21 08:23:44 2012
@@ -105,7 +105,7 @@ final class Lucene3xStoredFieldsReader e
@Override
public Lucene3xStoredFieldsReader clone() {
ensureOpen();
- return new Lucene3xStoredFieldsReader(fieldInfos, numTotalDocs, size, format, docStoreOffset, (IndexInput)fieldsStream.clone(), (IndexInput)indexStream.clone());
+ return new Lucene3xStoredFieldsReader(fieldInfos, numTotalDocs, size, format, docStoreOffset, fieldsStream.clone(), indexStream.clone());
}
/** Verifies that the code version which wrote the segment is supported. */
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java Tue Aug 21 08:23:44 2012
@@ -383,7 +383,7 @@ class Lucene3xTermVectorsReader extends
// NOTE: tvf is pre-positioned by caller
public TVTermsEnum() throws IOException {
this.origTVF = Lucene3xTermVectorsReader.this.tvf;
- tvf = (IndexInput) origTVF.clone();
+ tvf = origTVF.clone();
}
public boolean canReuse(IndexInput tvf) {
@@ -706,9 +706,9 @@ class Lucene3xTermVectorsReader extends
// These are null when a TermVectorsReader was created
// on a segment that did not have term vectors saved
if (tvx != null && tvd != null && tvf != null) {
- cloneTvx = (IndexInput) tvx.clone();
- cloneTvd = (IndexInput) tvd.clone();
- cloneTvf = (IndexInput) tvf.clone();
+ cloneTvx = tvx.clone();
+ cloneTvd = tvd.clone();
+ cloneTvf = tvf.clone();
}
return new Lucene3xTermVectorsReader(fieldInfos, cloneTvx, cloneTvd, cloneTvf, size, numTotalDocs, docStoreOffset, format);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermDocs.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermDocs.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermDocs.java Tue Aug 21 08:23:44 2012
@@ -54,7 +54,7 @@ class SegmentTermDocs {
protected IndexOptions indexOptions;
public SegmentTermDocs(IndexInput freqStream, TermInfosReader tis, FieldInfos fieldInfos) {
- this.freqStream = (IndexInput) freqStream.clone();
+ this.freqStream = freqStream.clone();
this.tis = tis;
this.fieldInfos = fieldInfos;
skipInterval = tis.getSkipInterval();
@@ -201,7 +201,7 @@ class SegmentTermDocs {
// don't skip if the target is close (within skipInterval docs away)
if ((target - skipInterval) >= doc && df >= skipInterval) { // optimized case
if (skipListReader == null)
- skipListReader = new Lucene3xSkipListReader((IndexInput) freqStream.clone(), maxSkipLevels, skipInterval); // lazily clone
+ skipListReader = new Lucene3xSkipListReader(freqStream.clone(), maxSkipLevels, skipInterval); // lazily clone
if (!haveSkipped) { // lazily initialize skip stream
skipListReader.init(skipPointer, freqBasePointer, proxBasePointer, df, currentFieldStoresPayloads);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermEnum.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermEnum.java Tue Aug 21 08:23:44 2012
@@ -106,7 +106,7 @@ final class SegmentTermEnum implements C
clone = (SegmentTermEnum) super.clone();
} catch (CloneNotSupportedException e) {}
- clone.input = (IndexInput) input.clone();
+ clone.input = input.clone();
clone.termInfo = new TermInfo(termInfo);
clone.termBuffer = termBuffer.clone();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermPositions.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermPositions.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermPositions.java Tue Aug 21 08:23:44 2012
@@ -172,7 +172,7 @@ extends SegmentTermDocs {
private void lazySkip() throws IOException {
if (proxStream == null) {
// clone lazily
- proxStream = (IndexInput)proxStreamOrig.clone();
+ proxStream = proxStreamOrig.clone();
}
// we might have to skip the current payload
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java Tue Aug 21 08:23:44 2012
@@ -325,7 +325,7 @@ public class Lucene40PostingsReader exte
SegmentDocsEnumBase(IndexInput startFreqIn, Bits liveDocs) {
this.startFreqIn = startFreqIn;
- this.freqIn = (IndexInput)startFreqIn.clone();
+ this.freqIn = startFreqIn.clone();
this.liveDocs = liveDocs;
}
@@ -474,7 +474,7 @@ public class Lucene40PostingsReader exte
if (skipper == null) {
// This is the first time this enum has ever been used for skipping -- do lazy init
- skipper = new Lucene40SkipListReader((IndexInput) freqIn.clone(), maxSkipLevels, skipInterval);
+ skipper = new Lucene40SkipListReader(freqIn.clone(), maxSkipLevels, skipInterval);
}
if (!skipped) {
@@ -705,8 +705,8 @@ public class Lucene40PostingsReader exte
public SegmentDocsAndPositionsEnum(IndexInput freqIn, IndexInput proxIn) {
startFreqIn = freqIn;
- this.freqIn = (IndexInput) freqIn.clone();
- this.proxIn = (IndexInput) proxIn.clone();
+ this.freqIn = freqIn.clone();
+ this.proxIn = proxIn.clone();
}
public SegmentDocsAndPositionsEnum reset(FieldInfo fieldInfo, StandardTermState termState, Bits liveDocs) throws IOException {
@@ -795,7 +795,7 @@ public class Lucene40PostingsReader exte
if (skipper == null) {
// This is the first time this enum has ever been used for skipping -- do lazy init
- skipper = new Lucene40SkipListReader((IndexInput) freqIn.clone(), maxSkipLevels, skipInterval);
+ skipper = new Lucene40SkipListReader(freqIn.clone(), maxSkipLevels, skipInterval);
}
if (!skipped) {
@@ -913,8 +913,8 @@ public class Lucene40PostingsReader exte
public SegmentFullPositionsEnum(IndexInput freqIn, IndexInput proxIn) {
startFreqIn = freqIn;
- this.freqIn = (IndexInput) freqIn.clone();
- this.proxIn = (IndexInput) proxIn.clone();
+ this.freqIn = freqIn.clone();
+ this.proxIn = proxIn.clone();
}
public SegmentFullPositionsEnum reset(FieldInfo fieldInfo, StandardTermState termState, Bits liveDocs) throws IOException {
@@ -1009,7 +1009,7 @@ public class Lucene40PostingsReader exte
if (skipper == null) {
// This is the first time this enum has ever been used for skipping -- do lazy init
- skipper = new Lucene40SkipListReader((IndexInput) freqIn.clone(), maxSkipLevels, skipInterval);
+ skipper = new Lucene40SkipListReader(freqIn.clone(), maxSkipLevels, skipInterval);
}
if (!skipped) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java Tue Aug 21 08:23:44 2012
@@ -61,7 +61,7 @@ public final class Lucene40StoredFieldsR
@Override
public Lucene40StoredFieldsReader clone() {
ensureOpen();
- return new Lucene40StoredFieldsReader(fieldInfos, numTotalDocs, size, (IndexInput)fieldsStream.clone(), (IndexInput)indexStream.clone());
+ return new Lucene40StoredFieldsReader(fieldInfos, numTotalDocs, size, fieldsStream.clone(), indexStream.clone());
}
// Used only by clone
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java Tue Aug 21 08:23:44 2012
@@ -403,7 +403,7 @@ public class Lucene40TermVectorsReader e
// NOTE: tvf is pre-positioned by caller
public TVTermsEnum() {
this.origTVF = Lucene40TermVectorsReader.this.tvf;
- tvf = (IndexInput) origTVF.clone();
+ tvf = origTVF.clone();
}
public boolean canReuse(IndexInput tvf) {
@@ -752,9 +752,9 @@ public class Lucene40TermVectorsReader e
// These are null when a TermVectorsReader was created
// on a segment that did not have term vectors saved
if (tvx != null && tvd != null && tvf != null) {
- cloneTvx = (IndexInput) tvx.clone();
- cloneTvd = (IndexInput) tvd.clone();
- cloneTvf = (IndexInput) tvf.clone();
+ cloneTvx = tvx.clone();
+ cloneTvd = tvd.clone();
+ cloneTvf = tvf.clone();
}
return new Lucene40TermVectorsReader(fieldInfos, cloneTvx, cloneTvd, cloneTvf, size, numTotalDocs);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/Bytes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/Bytes.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/Bytes.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/Bytes.java Tue Aug 21 08:23:44 2012
@@ -349,7 +349,7 @@ public final class Bytes {
*/
protected final IndexInput cloneData() {
assert datIn != null;
- return (IndexInput) datIn.clone();
+ return datIn.clone();
}
/**
@@ -357,7 +357,7 @@ public final class Bytes {
*/
protected final IndexInput cloneIndex() {
assert idxIn != null;
- return (IndexInput) idxIn.clone();
+ return idxIn.clone();
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/PackedIntValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/PackedIntValues.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/PackedIntValues.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/PackedIntValues.java Tue Aug 21 08:23:44 2012
@@ -186,7 +186,7 @@ class PackedIntValues {
final Source source;
IndexInput input = null;
try {
- input = (IndexInput) datIn.clone();
+ input = datIn.clone();
if (values == null) {
source = new PackedIntsSource(input, false);
@@ -217,7 +217,7 @@ class PackedIntValues {
@Override
public Source getDirectSource() throws IOException {
- return values != null ? new FixedStraightBytesImpl.DirectFixedStraightSource((IndexInput) datIn.clone(), 8, Type.FIXED_INTS_64) : new PackedIntsSource((IndexInput) datIn.clone(), true);
+ return values != null ? new FixedStraightBytesImpl.DirectFixedStraightSource(datIn.clone(), 8, Type.FIXED_INTS_64) : new PackedIntsSource(datIn.clone(), true);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarSortedBytesImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarSortedBytesImpl.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarSortedBytesImpl.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarSortedBytesImpl.java Tue Aug 21 08:23:44 2012
@@ -211,7 +211,7 @@ final class VarSortedBytesImpl {
valueCount = ordToOffsetIndex.size()-1; // the last value here is just a dummy value to get the length of the last value
// advance this iterator to the end and clone the stream once it points to the docToOrdIndex header
ordToOffsetIndex.get(valueCount);
- docToOrdIndex = PackedInts.getDirectReader((IndexInput) idxIn.clone()); // read the ords in to prevent too many random disk seeks
+ docToOrdIndex = PackedInts.getDirectReader(idxIn.clone()); // read the ords in to prevent too many random disk seeks
basePointer = datIn.getFilePointer();
this.datIn = datIn;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java Tue Aug 21 08:23:44 2012
@@ -418,7 +418,7 @@ public class SepPostingsReader extends P
if (skipper == null) {
// This DocsEnum has never done any skipping
- skipper = new SepSkipListReader((IndexInput) skipIn.clone(),
+ skipper = new SepSkipListReader(skipIn.clone(),
freqIn,
docIn,
posIn,
@@ -506,7 +506,7 @@ public class SepPostingsReader extends P
freqIndex = freqIn.index();
posReader = posIn.reader();
posIndex = posIn.index();
- payloadIn = (IndexInput) SepPostingsReader.this.payloadIn.clone();
+ payloadIn = SepPostingsReader.this.payloadIn.clone();
}
SepDocsAndPositionsEnum init(FieldInfo fieldInfo, SepTermState termState, Bits liveDocs) throws IOException {
@@ -597,7 +597,7 @@ public class SepPostingsReader extends P
if (skipper == null) {
//System.out.println(" create skipper");
// This DocsEnum has never done any skipping
- skipper = new SepSkipListReader((IndexInput) skipIn.clone(),
+ skipper = new SepSkipListReader(skipIn.clone(),
freqIn,
docIn,
posIn,
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java Tue Aug 21 08:23:44 2012
@@ -70,7 +70,7 @@ class SimpleTextFieldsReader extends Fie
in = state.dir.openInput(SimpleTextPostingsFormat.getPostingsFileName(state.segmentInfo.name, state.segmentSuffix), state.context);
fieldInfos = state.fieldInfos;
- fields = readFields((IndexInput)in.clone());
+ fields = readFields(in.clone());
}
private TreeMap<String,Long> readFields(IndexInput in) throws IOException {
@@ -230,7 +230,7 @@ class SimpleTextFieldsReader extends Fie
public SimpleTextDocsEnum() {
this.inStart = SimpleTextFieldsReader.this.in;
- this.in = (IndexInput) this.inStart.clone();
+ this.in = this.inStart.clone();
}
public boolean canReuse(IndexInput in) {
@@ -330,7 +330,7 @@ class SimpleTextFieldsReader extends Fie
public SimpleTextDocsAndPositionsEnum() {
this.inStart = SimpleTextFieldsReader.this.in;
- this.in = (IndexInput) inStart.clone();
+ this.in = inStart.clone();
}
public boolean canReuse(IndexInput in) {
@@ -500,7 +500,7 @@ class SimpleTextFieldsReader extends Fie
final PairOutputs<Long,PairOutputs.Pair<Long,Long>> outputs = new PairOutputs<Long,PairOutputs.Pair<Long,Long>>(posIntOutputs,
outputsInner);
b = new Builder<PairOutputs.Pair<Long,PairOutputs.Pair<Long,Long>>>(FST.INPUT_TYPE.BYTE1, outputs);
- IndexInput in = (IndexInput) SimpleTextFieldsReader.this.in.clone();
+ IndexInput in = SimpleTextFieldsReader.this.in.clone();
in.seek(termsStart);
final BytesRef lastTerm = new BytesRef(10);
long lastDocsStart = -1;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPerDocProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPerDocProducer.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPerDocProducer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPerDocProducer.java Tue Aug 21 08:23:44 2012
@@ -132,7 +132,7 @@ public class SimpleTextPerDocProducer ex
@Override
public Source load() throws IOException {
boolean success = false;
- IndexInput in = (IndexInput) input.clone();
+ IndexInput in = input.clone();
try {
Source source = null;
switch (type) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java Tue Aug 21 08:23:44 2012
@@ -163,7 +163,7 @@ public class SimpleTextStoredFieldsReade
if (in == null) {
throw new AlreadyClosedException("this FieldsReader is closed");
}
- return new SimpleTextStoredFieldsReader(offsets, (IndexInput) in.clone(), fieldInfos);
+ return new SimpleTextStoredFieldsReader(offsets, in.clone(), fieldInfos);
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java Tue Aug 21 08:23:44 2012
@@ -205,7 +205,7 @@ public class SimpleTextTermVectorsReader
if (in == null) {
throw new AlreadyClosedException("this TermVectorsReader is closed");
}
- return new SimpleTextTermVectorsReader(offsets, (IndexInput) in.clone());
+ return new SimpleTextTermVectorsReader(offsets, in.clone());
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/DataInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/DataInput.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/DataInput.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/DataInput.java Tue Aug 21 08:23:44 2012
@@ -28,6 +28,13 @@ import org.apache.lucene.util.IOUtils;
/**
* Abstract base class for performing read operations of Lucene's low-level
* data types.
+ *
+ * <p>{@code DataInput} may only be used from one thread, because it is not
+ * thread safe (it keeps internal state like file position). To allow
+ * multithreaded use, every {@code DataInput} instance must be cloned before
+ * used in another thread. Subclasses must therefore implement {@link #clone()},
+ * returning a new {@code DataInput} which operates on the same underlying
+ * resource, but positioned independently.
*/
public abstract class DataInput implements Cloneable {
/** Reads and returns a single byte.
@@ -195,12 +202,11 @@ public abstract class DataInput implemen
*/
@Override
public DataInput clone() {
- DataInput clone = null;
try {
- clone = (DataInput)super.clone();
- } catch (CloneNotSupportedException e) {}
-
- return clone;
+ return (DataInput) super.clone();
+ } catch (CloneNotSupportedException e) {
+ throw new Error("This cannot happen: Failing to clone DataInput");
+ }
}
/** Reads a Map<String,String> previously written
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/DataOutput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/DataOutput.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/DataOutput.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/DataOutput.java Tue Aug 21 08:23:44 2012
@@ -27,6 +27,9 @@ import org.apache.lucene.util.UnicodeUti
/**
* Abstract base class for performing write operations of Lucene's low-level
* data types.
+
+ * <p>{@code DataOutput} may only be used from one thread, because it is not
+ * thread safe (it keeps internal state like file position).
*/
public abstract class DataOutput {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/Directory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/Directory.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/Directory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/Directory.java Tue Aug 21 08:23:44 2012
@@ -231,7 +231,7 @@ public abstract class Directory implemen
}
@Override
public IndexInput openFullSlice() {
- return (IndexInput) base.clone();
+ return base.clone();
}
};
}
@@ -278,7 +278,7 @@ public abstract class Directory implemen
SlicedIndexInput(final String sliceDescription, final IndexInput base, final long fileOffset, final long length, int readBufferSize) {
super("SlicedIndexInput(" + sliceDescription + " in " + base + " slice=" + fileOffset + ":" + (fileOffset+length) + ")", readBufferSize);
- this.base = (IndexInput) base.clone();
+ this.base = base.clone();
this.fileOffset = fileOffset;
this.length = length;
}
@@ -286,7 +286,7 @@ public abstract class Directory implemen
@Override
public SlicedIndexInput clone() {
SlicedIndexInput clone = (SlicedIndexInput)super.clone();
- clone.base = (IndexInput)base.clone();
+ clone.base = base.clone();
clone.fileOffset = fileOffset;
clone.length = length;
return clone;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/IndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/IndexInput.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/IndexInput.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/IndexInput.java Tue Aug 21 08:23:44 2012
@@ -22,6 +22,17 @@ import java.io.IOException;
/** Abstract base class for input from a file in a {@link Directory}. A
* random-access input stream. Used for all Lucene index input operations.
+ *
+ * <p>{@code IndexInput} may only be used from one thread, because it is not
+ * thread safe (it keeps internal state like file position). To allow
+ * multithreaded use, every {@code IndexInput} instance must be cloned before
+ * used in another thread. Subclasses must therefore implement {@link #clone()},
+ * returning a new {@code IndexInput} which operates on the same underlying
+ * resource, but positioned independently. Lucene never closes cloned
+ * {@code IndexInput}s, it will only do this on the original one.
+ * The original instance must take care that cloned instances throw
+ * {@link AlreadyClosedException} when the original one is closed.
+
* @see Directory
*/
public abstract class IndexInput extends DataInput implements Cloneable,Closeable {
@@ -83,4 +94,15 @@ public abstract class IndexInput extends
public String toString() {
return resourceDescription;
}
+
+ /** {@inheritDoc}
+ * <p><b>Warning:</b> Lucene never closes cloned
+ * {@code IndexInput}s, it will only do this on the original one.
+ * The original instance must take care that cloned instances throw
+ * {@link AlreadyClosedException} when the original one is closed.
+ */
+ @Override
+ public IndexInput clone() {
+ return (IndexInput) super.clone();
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/IndexOutput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/IndexOutput.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/IndexOutput.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/IndexOutput.java Tue Aug 21 08:23:44 2012
@@ -22,6 +22,10 @@ import java.io.IOException;
/** Abstract base class for output to a file in a Directory. A random-access
* output stream. Used for all Lucene index output operations.
+
+ * <p>{@code IndexOutput} may only be used from one thread, because it is not
+ * thread safe (it keeps internal state like file position).
+
* @see Directory
* @see IndexInput
*/
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCompoundFile.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCompoundFile.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCompoundFile.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCompoundFile.java Tue Aug 21 08:23:44 2012
@@ -350,7 +350,7 @@ public class TestCompoundFile extends Lu
IndexInput one = cr.openInput("f11", newIOContext(random()));
- IndexInput two = (IndexInput) one.clone();
+ IndexInput two = one.clone();
assertSameStreams("basic clone one", expected, one);
expected.seek(0);
@@ -476,8 +476,8 @@ public class TestCompoundFile extends Lu
IndexInput e1 = cr.openInput("f11", newIOContext(random()));
IndexInput e2 = cr.openInput("f3", newIOContext(random()));
- IndexInput a1 = (IndexInput) e1.clone();
- IndexInput a2 = (IndexInput) e2.clone();
+ IndexInput a1 = e1.clone();
+ IndexInput a2 = e2.clone();
// Seek the first pair
e1.seek(100);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java Tue Aug 21 08:23:44 2012
@@ -186,7 +186,7 @@ public class TestFieldsReader extends Lu
}
@Override
public FaultyIndexInput clone() {
- return new FaultyIndexInput((IndexInput) delegate.clone());
+ return new FaultyIndexInput(delegate.clone());
}
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java Tue Aug 21 08:23:44 2012
@@ -226,7 +226,7 @@ public class TestLazyProxSkipping extend
@Override
public SeeksCountingStream clone() {
- return new SeeksCountingStream((IndexInput) this.input.clone());
+ return new SeeksCountingStream(this.input.clone());
}
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java Tue Aug 21 08:23:44 2012
@@ -190,7 +190,7 @@ public class TestMultiLevelSkipList exte
@Override
public CountingStream clone() {
- return new CountingStream((IndexInput) this.input.clone());
+ return new CountingStream(this.input.clone());
}
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestCopyBytes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestCopyBytes.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestCopyBytes.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestCopyBytes.java Tue Aug 21 08:23:44 2012
@@ -127,7 +127,7 @@ public class TestCopyBytes extends Lucen
// now make N copies of the remaining bytes
CopyThread copies[] = new CopyThread[10];
for (int i = 0; i < copies.length; i++) {
- copies[i] = new CopyThread((IndexInput) input.clone(), d.createOutput("copy" + i, IOContext.DEFAULT));
+ copies[i] = new CopyThread(input.clone(), d.createOutput("copy" + i, IOContext.DEFAULT));
}
for (int i = 0; i < copies.length; i++) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java Tue Aug 21 08:23:44 2012
@@ -53,8 +53,8 @@ public class TestMultiMMap extends Lucen
io.writeVInt(5);
io.close();
IndexInput one = mmapDir.openInput("bytes", IOContext.DEFAULT);
- IndexInput two = (IndexInput) one.clone();
- IndexInput three = (IndexInput) two.clone(); // clone of clone
+ IndexInput two = one.clone();
+ IndexInput three = two.clone(); // clone of clone
one.close();
try {
one.readVInt();
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/util/SlowRAMDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/util/SlowRAMDirectory.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/util/SlowRAMDirectory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/util/SlowRAMDirectory.java Tue Aug 21 08:23:44 2012
@@ -107,7 +107,7 @@ public class SlowRAMDirectory extends RA
ii.readBytes(b, offset, len);
}
- @Override public IndexInput clone() { return (IndexInput)ii.clone(); }
+ @Override public IndexInput clone() { return ii.clone(); }
@Override public void close() throws IOException { ii.close(); }
@Override public boolean equals(Object o) { return ii.equals(o); }
@Override public long getFilePointer() { return ii.getFilePointer(); }
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/mocksep/MockSingleIntIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/mocksep/MockSingleIntIndexInput.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/mocksep/MockSingleIntIndexInput.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/mocksep/MockSingleIntIndexInput.java Tue Aug 21 08:23:44 2012
@@ -46,7 +46,7 @@ public class MockSingleIntIndexInput ext
@Override
public Reader reader() throws IOException {
- return new Reader((IndexInput) in.clone());
+ return new Reader(in.clone());
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexInputWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexInputWrapper.java?rev=1375429&r1=1375428&r2=1375429&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexInputWrapper.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexInputWrapper.java Tue Aug 21 08:23:44 2012
@@ -68,7 +68,7 @@ public class MockIndexInputWrapper exten
public MockIndexInputWrapper clone() {
ensureOpen();
dir.inputCloneCount.incrementAndGet();
- IndexInput iiclone = (IndexInput) delegate.clone();
+ IndexInput iiclone = delegate.clone();
MockIndexInputWrapper clone = new MockIndexInputWrapper(dir, name, iiclone);
clone.isClone = true;
// Pending resolution on LUCENE-686 we may want to