You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by mi...@apache.org on 2007/12/05 14:59:39 UTC
svn commit: r601337 - in /lucene/java/trunk/src/java/org/apache/lucene:
analysis/ index/ search/ search/function/ store/
Author: mikemccand
Date: Wed Dec 5 05:59:37 2007
New Revision: 601337
URL: http://svn.apache.org/viewvc?rev=601337&view=rev
Log:
LUCENE-1078: remove dead code
Modified:
lucene/java/trunk/src/java/org/apache/lucene/analysis/StopFilter.java
lucene/java/trunk/src/java/org/apache/lucene/index/DocumentsWriter.java
lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java
lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsReader.java
lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsWriter.java
lucene/java/trunk/src/java/org/apache/lucene/search/ComplexExplanation.java
lucene/java/trunk/src/java/org/apache/lucene/search/Similarity.java
lucene/java/trunk/src/java/org/apache/lucene/search/function/ValueSource.java
lucene/java/trunk/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java
Modified: lucene/java/trunk/src/java/org/apache/lucene/analysis/StopFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/analysis/StopFilter.java?rev=601337&r1=601336&r2=601337&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/analysis/StopFilter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/analysis/StopFilter.java Wed Dec 5 05:59:37 2007
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.Set;
/**
Modified: lucene/java/trunk/src/java/org/apache/lucene/index/DocumentsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/DocumentsWriter.java?rev=601337&r1=601336&r2=601337&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/DocumentsWriter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/DocumentsWriter.java Wed Dec 5 05:59:37 2007
@@ -1900,7 +1900,6 @@
private ByteSliceReader freq = new ByteSliceReader();
private ByteSliceReader prox = new ByteSliceReader();
- private int lastDocID;
private int docID;
private int termFreq;
Modified: lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java?rev=601337&r1=601336&r2=601337&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java Wed Dec 5 05:59:37 2007
@@ -36,9 +36,6 @@
import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.util.BitVector;
-import java.io.IOException;
-import java.util.*;
-
/**
* @version $Id$
*/
@@ -301,7 +298,6 @@
fieldInfos = new FieldInfos(cfsDir, segment + ".fnm");
final String fieldsSegment;
- final Directory dir;
if (si.getDocStoreOffset() != -1)
fieldsSegment = si.getDocStoreSegment();
@@ -424,7 +420,6 @@
// and can thus not be shared among multiple SegmentReaders
// TODO: Change this in case FieldsReader becomes thread-safe in the future
final String fieldsSegment;
- final Directory dir;
Directory storeDir = directory();
Modified: lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsReader.java?rev=601337&r1=601336&r2=601337&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsReader.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsReader.java Wed Dec 5 05:59:37 2007
@@ -429,18 +429,16 @@
class ParallelArrayTermVectorMapper extends TermVectorMapper
{
- private int numTerms;
private String[] terms;
private int[] termFreqs;
- private int positions[][] = null;
- private TermVectorOffsetInfo offsets[][] = null;
+ private int positions[][];
+ private TermVectorOffsetInfo offsets[][];
private int currentPosition;
private boolean storingOffsets;
private boolean storingPositions;
private String field;
public void setExpectations(String field, int numTerms, boolean storeOffsets, boolean storePositions) {
- this.numTerms = numTerms;
this.field = field;
terms = new String[numTerms];
termFreqs = new int[numTerms];
Modified: lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsWriter.java?rev=601337&r1=601336&r2=601337&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsWriter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/TermVectorsWriter.java Wed Dec 5 05:59:37 2007
@@ -72,7 +72,6 @@
tvf.writeVInt(numTerms);
final TermPositionVector tpVector;
- final TermFreqVector tfVector;
final byte bits;
final boolean storePositions;
@@ -81,14 +80,12 @@
if (vectors[i] instanceof TermPositionVector) {
// May have positions & offsets
tpVector = (TermPositionVector) vectors[i];
- tfVector = null;
storePositions = tpVector.size() > 0 && tpVector.getTermPositions(0) != null;
storeOffsets = tpVector.size() > 0 && tpVector.getOffsets(0) != null;
bits = (byte) ((storePositions ? TermVectorsReader.STORE_POSITIONS_WITH_TERMVECTOR : 0) +
(storeOffsets ? TermVectorsReader.STORE_OFFSET_WITH_TERMVECTOR : 0));
} else {
tpVector = null;
- tfVector = vectors[i];
bits = 0;
storePositions = false;
storeOffsets = false;
Modified: lucene/java/trunk/src/java/org/apache/lucene/search/ComplexExplanation.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/ComplexExplanation.java?rev=601337&r1=601336&r2=601337&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/ComplexExplanation.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/ComplexExplanation.java Wed Dec 5 05:59:37 2007
@@ -17,8 +17,6 @@
* limitations under the License.
*/
-import java.util.ArrayList;
-
/** Expert: Describes the score computation for document and query, andcan distinguish a match independent of a positive value. */
public class ComplexExplanation extends Explanation {
private Boolean match;
Modified: lucene/java/trunk/src/java/org/apache/lucene/search/Similarity.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/Similarity.java?rev=601337&r1=601336&r2=601337&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/Similarity.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/Similarity.java Wed Dec 5 05:59:37 2007
@@ -17,8 +17,6 @@
* limitations under the License.
*/
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.util.SmallFloat;
Modified: lucene/java/trunk/src/java/org/apache/lucene/search/function/ValueSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/function/ValueSource.java?rev=601337&r1=601336&r2=601337&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/function/ValueSource.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/function/ValueSource.java Wed Dec 5 05:59:37 2007
@@ -19,7 +19,6 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.function.DocValues;
-import org.apache.lucene.util.ToStringUtils;
import java.io.IOException;
import java.io.Serializable;
Modified: lucene/java/trunk/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java?rev=601337&r1=601336&r2=601337&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java Wed Dec 5 05:59:37 2007
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.util.HashSet;
-import java.util.Enumeration;
/**
* Implements {@link LockFactory} for a single in-process instance,