You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2013/04/04 23:49:27 UTC
svn commit: r1464776 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/codecs/ lucene/codecs/src/java/org/apache/lucene/codecs/memory/
lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/
lucene/codecs/src/java/org/apache/lucene/codecs/simplet...
Author: jpountz
Date: Thu Apr 4 21:49:26 2013
New Revision: 1464776
URL: http://svn.apache.org/r1464776
Log:
LUCENE-4874: Don't override non abstract methods that have an impl through
other abstract methods in FilterAtomicReader and related classes (merged from
r1464710 and r1464768).
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/lucene/codecs/ (props changed)
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.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/index/BaseCompositeReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TermsEnum.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DocIdSetIterator.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java
lucene/dev/branches/branch_4x/lucene/memory/ (props changed)
lucene/dev/branches/branch_4x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/branches/branch_4x/lucene/misc/ (props changed)
lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java
lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingAtomicReader.java
lucene/dev/branches/branch_4x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_4x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeFilter.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/ramonly/RAMOnlyPostingsFormat.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestDocSet.java
Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Thu Apr 4 21:49:26 2013
@@ -33,6 +33,11 @@ Changes in backwards compatibility polic
interface. IndexDeletionPolicy, MergeScheduler and InfoStream now implement
Cloneable. (Adrien Grand)
+* LUCENE-4874: FilterAtomicReader and related classes (FilterTerms,
+ FilterDocsEnum, ...) don't forward anymore to the filtered instance when the
+ method has a default implementation through other abstract methods.
+ (Adrien Grand, Robert Muir)
+
New Features
* LUCENE-4815: DrillSideways now allows more than one FacetRequest per
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java Thu Apr 4 21:49:26 2013
@@ -1490,12 +1490,10 @@ public final class DirectPostingsFormat
}
@Override
- public int advance(int target) {
+ public int advance(int target) throws IOException {
// Linear scan, but this is low-freq term so it won't
// be costly:
- while(nextDoc() < target) {
- }
- return docID();
+ return slowAdvance(target);
}
@Override
@@ -1560,12 +1558,10 @@ public final class DirectPostingsFormat
}
@Override
- public int advance(int target) {
+ public int advance(int target) throws IOException {
// Linear scan, but this is low-freq term so it won't
// be costly:
- while(nextDoc() < target) {
- }
- return docID();
+ return slowAdvance(target);
}
@Override
@@ -1646,12 +1642,10 @@ public final class DirectPostingsFormat
}
@Override
- public int advance(int target) {
+ public int advance(int target) throws IOException {
// Linear scan, but this is low-freq term so it won't
// be costly:
- while(nextDoc() < target) {
- }
- return docID();
+ return slowAdvance(target);
}
@Override
@@ -1792,12 +1786,8 @@ public final class DirectPostingsFormat
}
@Override
- public int advance(int target) {
- // Linear scan, but this is low-freq term so it won't
- // be costly:
- while (nextDoc() < target) {
- }
- return docID;
+ public int advance(int target) throws IOException {
+ return slowAdvance(target);
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java Thu Apr 4 21:49:26 2013
@@ -416,15 +416,12 @@ public final class MemoryPostingsFormat
}
@Override
- public int advance(int target) {
+ public int advance(int target) throws IOException {
// TODO: we could make more efficient version, but, it
// should be rare that this will matter in practice
// since usually apps will not store "big" fields in
// this codec!
- //System.out.println("advance start docID=" + docID + " target=" + target);
- while(nextDoc() < target) {
- }
- return docID;
+ return slowAdvance(target);
}
@Override
@@ -607,16 +604,12 @@ public final class MemoryPostingsFormat
}
@Override
- public int advance(int target) {
+ public int advance(int target) throws IOException {
// TODO: we could make more efficient version, but, it
// should be rare that this will matter in practice
// since usually apps will not store "big" fields in
// this codec!
- //System.out.println("advance target=" + target);
- while(nextDoc() < target) {
- }
- //System.out.println(" return " + docID);
- return docID;
+ return slowAdvance(target);
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java Thu Apr 4 21:49:26 2013
@@ -362,12 +362,7 @@ public class PulsingPostingsReader exten
@Override
public int advance(int target) throws IOException {
- int doc;
- while((doc=nextDoc()) != NO_MORE_DOCS) {
- if (doc >= target)
- return doc;
- }
- return docID = NO_MORE_DOCS;
+ return docID = slowAdvance(target);
}
@Override
@@ -474,13 +469,7 @@ public class PulsingPostingsReader exten
@Override
public int advance(int target) throws IOException {
- int doc;
- while((doc=nextDoc()) != NO_MORE_DOCS) {
- if (doc >= target) {
- return docID = doc;
- }
- }
- return docID = NO_MORE_DOCS;
+ return docID = slowAdvance(target);
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java Thu Apr 4 21:49:26 2013
@@ -315,8 +315,7 @@ class SimpleTextFieldsReader extends Fie
@Override
public int advance(int target) throws IOException {
// Naive -- better to index skip data
- while(nextDoc() < target);
- return docID;
+ return slowAdvance(target);
}
@Override
@@ -422,8 +421,7 @@ class SimpleTextFieldsReader extends Fie
@Override
public int advance(int target) throws IOException {
// Naive -- better to index skip data
- while(nextDoc() < target);
- return docID;
+ return slowAdvance(target);
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java Thu Apr 4 21:49:26 2013
@@ -430,12 +430,8 @@ public class SimpleTextTermVectorsReader
}
@Override
- public int advance(int target) {
- if (!didNext && target == 0) {
- return nextDoc();
- } else {
- return (doc = NO_MORE_DOCS);
- }
+ public int advance(int target) throws IOException {
+ return slowAdvance(target);
}
public void reset(Bits liveDocs, int freq) {
@@ -487,12 +483,8 @@ public class SimpleTextTermVectorsReader
}
@Override
- public int advance(int target) {
- if (!didNext && target == 0) {
- return nextDoc();
- } else {
- return (doc = NO_MORE_DOCS);
- }
+ public int advance(int target) throws IOException {
+ return slowAdvance(target);
}
public void reset(Bits liveDocs, int[] positions, int[] startOffsets, int[] endOffsets, BytesRef payloads[]) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java Thu Apr 4 21:49:26 2013
@@ -1030,11 +1030,7 @@ public final class CompressingTermVector
@Override
public int advance(int target) throws IOException {
- if (doc == -1 && target == 0 && (liveDocs == null || liveDocs.get(0))) {
- return (doc = 0);
- } else {
- return (doc = NO_MORE_DOCS);
- }
+ return slowAdvance(target);
}
@Override
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=1464776&r1=1464775&r2=1464776&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 Thu Apr 4 21:49:26 2013
@@ -605,12 +605,8 @@ public class Lucene40TermVectorsReader e
}
@Override
- public int advance(int target) {
- if (!didNext && target == 0) {
- return nextDoc();
- } else {
- return (doc = NO_MORE_DOCS);
- }
+ public int advance(int target) throws IOException {
+ return slowAdvance(target);
}
public void reset(Bits liveDocs, int freq) {
@@ -664,12 +660,8 @@ public class Lucene40TermVectorsReader e
}
@Override
- public int advance(int target) {
- if (!didNext && target == 0) {
- return nextDoc();
- } else {
- return (doc = NO_MORE_DOCS);
- }
+ public int advance(int target) throws IOException {
+ return slowAdvance(target);
}
public void reset(Bits liveDocs, int[] positions, int[] startOffsets, int[] endOffsets, int[] payloadLengths, byte[] payloadBytes) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/BaseCompositeReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/BaseCompositeReader.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/BaseCompositeReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/BaseCompositeReader.java Thu Apr 4 21:49:26 2013
@@ -51,7 +51,6 @@ public abstract class BaseCompositeReade
private final int[] starts; // 1st docno for each reader
private final int maxDoc;
private final int numDocs;
- private final boolean hasDeletions;
/** List view solely for {@link #getSequentialSubReaders()},
* for effectiveness the array is used internally. */
@@ -70,7 +69,6 @@ public abstract class BaseCompositeReade
this.subReadersList = Collections.unmodifiableList(Arrays.asList(subReaders));
starts = new int[subReaders.length + 1]; // build starts array
int maxDoc = 0, numDocs = 0;
- boolean hasDeletions = false;
for (int i = 0; i < subReaders.length; i++) {
starts[i] = maxDoc;
final IndexReader r = subReaders[i];
@@ -79,15 +77,11 @@ public abstract class BaseCompositeReade
throw new IllegalArgumentException("Too many documents, composite IndexReaders cannot exceed " + Integer.MAX_VALUE);
}
numDocs += r.numDocs(); // compute numDocs
- if (r.hasDeletions()) {
- hasDeletions = true;
- }
r.registerParentReader(this);
}
starts[subReaders.length] = maxDoc;
this.maxDoc = maxDoc;
this.numDocs = numDocs;
- this.hasDeletions = hasDeletions;
}
@Override
@@ -117,12 +111,6 @@ public abstract class BaseCompositeReade
}
@Override
- public final boolean hasDeletions() {
- // Don't call ensureOpen() here (it could affect performance)
- return hasDeletions;
- }
-
- @Override
public final int docFreq(Term term) throws IOException {
ensureOpen();
int total = 0; // sum freqs in subreaders
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java Thu Apr 4 21:49:26 2013
@@ -17,15 +17,16 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import org.apache.lucene.util.AttributeSource;
-import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.automaton.CompiledAutomaton;
-
import java.io.IOException;
import java.util.Comparator;
import java.util.Iterator;
+import org.apache.lucene.search.CachingWrapperFilter;
+import org.apache.lucene.search.FieldCache;
+import org.apache.lucene.util.AttributeSource;
+import org.apache.lucene.util.Bits;
+import org.apache.lucene.util.BytesRef;
+
/** A <code>FilterAtomicReader</code> contains another AtomicReader, which it
* uses as its basic source of data, possibly transforming the data along the
* way or providing additional functionality. The class
@@ -34,6 +35,15 @@ import java.util.Iterator;
* contained index reader. Subclasses of <code>FilterAtomicReader</code> may
* further override some of these methods and may also provide additional
* methods and fields.
+ * <p><b>NOTE</b>: If you override {@link #getLiveDocs()}, you will likely need
+ * to override {@link #numDocs()} as well and vice-versa.
+ * <p><b>NOTE</b>: If this {@link FilterAtomicReader} does not change the
+ * content the contained reader, you could consider overriding
+ * {@link #getCoreCacheKey()} so that {@link FieldCache} and
+ * {@link CachingWrapperFilter} share the same entries for this atomic reader
+ * and the wrapped one. {@link #getCombinedCoreAndDeletesKey()} could be
+ * overridden as well if the {@link #getLiveDocs() live docs} are not changed
+ * either.
*/
public class FilterAtomicReader extends AtomicReader {
@@ -65,15 +75,13 @@ public class FilterAtomicReader extends
public int size() {
return in.size();
}
-
- @Override
- public long getUniqueTermCount() throws IOException {
- return in.getUniqueTermCount();
- }
}
- /** Base class for filtering {@link Terms}
- * implementations. */
+ /** Base class for filtering {@link Terms} implementations.
+ * <p><b>NOTE</b>: If the order of terms and documents is not changed, and if
+ * these terms are going to be intersected with automata, you could consider
+ * overriding {@link #intersect} for better performance.
+ */
public static class FilterTerms extends Terms {
/** The underlying Terms instance. */
protected final Terms in;
@@ -90,7 +98,7 @@ public class FilterAtomicReader extends
public TermsEnum iterator(TermsEnum reuse) throws IOException {
return in.iterator(reuse);
}
-
+
@Override
public Comparator<BytesRef> getComparator() {
return in.getComparator();
@@ -115,11 +123,6 @@ public class FilterAtomicReader extends
public int getDocCount() throws IOException {
return in.getDocCount();
}
-
- @Override
- public TermsEnum intersect(CompiledAutomaton automaton, BytesRef bytes) throws java.io.IOException {
- return in.intersect(automaton, bytes);
- }
@Override
public boolean hasOffsets() {
@@ -149,8 +152,8 @@ public class FilterAtomicReader extends
public FilterTermsEnum(TermsEnum in) { this.in = in; }
@Override
- public boolean seekExact(BytesRef text, boolean useCache) throws IOException {
- return in.seekExact(text, useCache);
+ public AttributeSource attributes() {
+ return in.attributes();
}
@Override
@@ -202,21 +205,6 @@ public class FilterAtomicReader extends
public Comparator<BytesRef> getComparator() {
return in.getComparator();
}
-
- @Override
- public void seekExact(BytesRef term, TermState state) throws IOException {
- in.seekExact(term, state);
- }
-
- @Override
- public TermState termState() throws IOException {
- return in.termState();
- }
-
- @Override
- public AttributeSource attributes() {
- return in.attributes();
- }
}
/** Base class for filtering {@link DocsEnum} implementations. */
@@ -233,6 +221,11 @@ public class FilterAtomicReader extends
}
@Override
+ public AttributeSource attributes() {
+ return in.attributes();
+ }
+
+ @Override
public int docID() {
return in.docID();
}
@@ -251,11 +244,6 @@ public class FilterAtomicReader extends
public int advance(int target) throws IOException {
return in.advance(target);
}
-
- @Override
- public AttributeSource attributes() {
- return in.attributes();
- }
@Override
public long cost() {
@@ -277,6 +265,11 @@ public class FilterAtomicReader extends
}
@Override
+ public AttributeSource attributes() {
+ return in.attributes();
+ }
+
+ @Override
public int docID() {
return in.docID();
}
@@ -317,11 +310,6 @@ public class FilterAtomicReader extends
}
@Override
- public AttributeSource attributes() {
- return in.attributes();
- }
-
- @Override
public long cost() {
return in.cost();
}
@@ -378,12 +366,6 @@ public class FilterAtomicReader extends
}
@Override
- public boolean hasDeletions() {
- ensureOpen();
- return in.hasDeletions();
- }
-
- @Override
protected void doClose() throws IOException {
in.close();
}
@@ -394,24 +376,6 @@ public class FilterAtomicReader extends
return in.fields();
}
- /** {@inheritDoc}
- * <p>If the subclass of FilteredIndexReader modifies the
- * contents (but not liveDocs) of the index, you must override this
- * method to provide a different key. */
- @Override
- public Object getCoreCacheKey() {
- return in.getCoreCacheKey();
- }
-
- /** {@inheritDoc}
- * <p>If the subclass of FilteredIndexReader modifies the
- * liveDocs, you must override this
- * method to provide a different key. */
- @Override
- public Object getCombinedCoreAndDeletesKey() {
- return in.getCombinedCoreAndDeletesKey();
- }
-
@Override
public String toString() {
final StringBuilder buffer = new StringBuilder("FilterAtomicReader(");
@@ -449,4 +413,5 @@ public class FilterAtomicReader extends
ensureOpen();
return in.getNormValues(field);
}
+
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexReader.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexReader.java Thu Apr 4 21:49:26 2013
@@ -22,16 +22,16 @@ import java.io.IOException;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
-import java.util.WeakHashMap;
import java.util.Set;
+import java.util.WeakHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.DocumentStoredFieldVisitor;
-import org.apache.lucene.search.SearcherManager; // javadocs
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.Bits;
+// javadocs
/** IndexReader is an abstract class, providing an interface for accessing an
index. Search of an index is done entirely through this abstract interface,
@@ -448,8 +448,12 @@ public abstract class IndexReader implem
return visitor.getDocument();
}
- /** Returns true if any documents have been deleted */
- public abstract boolean hasDeletions();
+ /** Returns true if any documents have been deleted. Implementers should
+ * consider overriding this method if {@link #maxDoc()} or {@link #numDocs()}
+ * are not constant-time operations. */
+ public boolean hasDeletions() {
+ return numDeletedDocs() > 0;
+ }
/**
* Closes files associated with this index.
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java Thu Apr 4 21:49:26 2013
@@ -214,12 +214,6 @@ public final class ParallelAtomicReader
}
@Override
- public boolean hasDeletions() {
- ensureOpen();
- return hasDeletions;
- }
-
- @Override
public void document(int docID, StoredFieldVisitor visitor) throws IOException {
ensureOpen();
for (final AtomicReader reader: storedFieldsReaders) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java Thu Apr 4 21:49:26 2013
@@ -114,12 +114,6 @@ public final class SegmentReader extends
}
@Override
- public boolean hasDeletions() {
- // Don't call ensureOpen() here (it could affect performance)
- return liveDocs != null;
- }
-
- @Override
public FieldInfos getFieldInfos() {
ensureOpen();
return core.fieldInfos;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java Thu Apr 4 21:49:26 2013
@@ -219,12 +219,6 @@ public final class SlowCompositeReaderWr
ensureOpen();
return MultiFields.getMergedFieldInfos(in);
}
-
- @Override
- public boolean hasDeletions() {
- ensureOpen();
- return liveDocs != null;
- }
@Override
public Object getCoreCacheKey() {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TermsEnum.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TermsEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TermsEnum.java Thu Apr 4 21:49:26 2013
@@ -213,6 +213,7 @@ public abstract class TermsEnum implemen
return new TermState() {
@Override
public void copyFrom(TermState other) {
+ throw new UnsupportedOperationException();
}
};
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DocIdSetIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DocIdSetIterator.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DocIdSetIterator.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DocIdSetIterator.java Thu Apr 4 21:49:26 2013
@@ -93,6 +93,18 @@ public abstract class DocIdSetIterator {
*/
public abstract int advance(int target) throws IOException;
+ /** Slow (linear) implementation of {@link #advance} relying on
+ * {@link #nextDoc()} to advance beyond the target position. */
+ protected final int slowAdvance(int target) throws IOException {
+ assert docID() == NO_MORE_DOCS // can happen when the enum is not positioned yet
+ || docID() < target;
+ int doc;
+ do {
+ doc = nextDoc();
+ } while (doc < target);
+ return doc;
+ }
+
/**
* Returns the estimated cost of this {@link DocIdSetIterator}.
* <p>
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java Thu Apr 4 21:49:26 2013
@@ -21,12 +21,13 @@ package org.apache.lucene.index;
import java.io.IOException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.search.DocIdSetIterator;
-import org.apache.lucene.store.Directory;
import org.apache.lucene.store.BaseDirectoryWrapper;
+import org.apache.lucene.store.Directory;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
@@ -159,21 +160,27 @@ public class TestFilterAtomicReader exte
directory.close();
target.close();
}
-
- private void checkOverrideMethods(Class<?> clazz) {
- boolean fail = false;
- for (Method m : clazz.getMethods()) {
- int mods = m.getModifiers();
- if (Modifier.isStatic(mods) || Modifier.isFinal(mods) || m.isSynthetic()) {
+
+ private static void checkOverrideMethods(Class<?> clazz) throws NoSuchMethodException, SecurityException {
+ final Class<?> superClazz = clazz.getSuperclass();
+ for (Method m : superClazz.getMethods()) {
+ final int mods = m.getModifiers();
+ if (Modifier.isStatic(mods) || Modifier.isAbstract(mods) || Modifier.isFinal(mods) || m.isSynthetic()
+ || m.getName().equals("attributes")) {
continue;
}
- Class<?> declaringClass = m.getDeclaringClass();
- if (declaringClass != clazz && declaringClass != Object.class) {
- System.err.println("method is not overridden by "+clazz.getName()+": " + m.toGenericString());
- fail = true;
+ // The point of these checks is to ensure that methods that have a default
+ // impl through other methods are not overridden. This makes the number of
+ // methods to override to have a working impl minimal and prevents from some
+ // traps: for example, think about having getCoreCacheKey delegate to the
+ // filtered impl by default
+ final Method subM = clazz.getMethod(m.getName(), m.getParameterTypes());
+ if (subM.getDeclaringClass() == clazz
+ && m.getDeclaringClass() != Object.class
+ && m.getDeclaringClass() != subM.getDeclaringClass()) {
+ fail(clazz + " overrides " + m + " although it has a default impl");
}
}
- assertFalse(clazz.getName()+" does not override some methods; see log above", fail);
}
public void testOverrideMethods() throws Exception {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java Thu Apr 4 21:49:26 2013
@@ -17,6 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
@@ -55,9 +56,8 @@ public class TestDocIdSet extends Lucene
}
@Override
- public int advance(int target) {
- while (nextDoc() < target) {}
- return docid;
+ public int advance(int target) throws IOException {
+ return slowAdvance(target);
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/branches/branch_4x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Thu Apr 4 21:49:26 2013
@@ -63,7 +63,6 @@ import org.apache.lucene.util.ByteBlockP
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefHash.DirectBytesStartArray;
import org.apache.lucene.util.BytesRefHash;
-import org.apache.lucene.util.Constants; // for javadocs
import org.apache.lucene.util.Counter;
import org.apache.lucene.util.IntBlockPool.SliceReader;
import org.apache.lucene.util.IntBlockPool.SliceWriter;
@@ -1012,8 +1011,8 @@ public class MemoryIndex {
}
@Override
- public int advance(int target) {
- return nextDoc();
+ public int advance(int target) throws IOException {
+ return slowAdvance(target);
}
@Override
@@ -1068,8 +1067,8 @@ public class MemoryIndex {
}
@Override
- public int advance(int target) {
- return nextDoc();
+ public int advance(int target) throws IOException {
+ return slowAdvance(target);
}
@Override
@@ -1133,7 +1132,7 @@ public class MemoryIndex {
@Override
public int numDocs() {
if (DEBUG) System.err.println("MemoryIndexReader.numDocs");
- return fields.size() > 0 ? 1 : 0;
+ return 1;
}
@Override
@@ -1147,12 +1146,6 @@ public class MemoryIndex {
if (DEBUG) System.err.println("MemoryIndexReader.document");
// no-op: there are no stored fields
}
-
- @Override
- public boolean hasDeletions() {
- if (DEBUG) System.err.println("MemoryIndexReader.hasDeletions");
- return false;
- }
@Override
protected void doClose() {
Modified: lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java Thu Apr 4 21:49:26 2013
@@ -246,11 +246,6 @@ public class MultiPassIndexSplitter {
}
@Override
- public boolean hasDeletions() {
- return (in.maxDoc() != this.numDocs());
- }
-
- @Override
public Bits getLiveDocs() {
return liveDocs;
}
Modified: lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java Thu Apr 4 21:49:26 2013
@@ -161,11 +161,6 @@ public class PKIndexSplitter {
}
@Override
- public boolean hasDeletions() {
- return (in.maxDoc() != numDocs);
- }
-
- @Override
public Bits getLiveDocs() {
return liveDocs;
}
Modified: lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingAtomicReader.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingAtomicReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingAtomicReader.java Thu Apr 4 21:49:26 2013
@@ -394,8 +394,7 @@ public class SortingAtomicReader extends
public int advance(final int target) throws IOException {
// need to support it for checkIndex, but in practice it won't be called, so
// don't bother to implement efficiently for now.
- while (nextDoc() < target) {}
- return docID();
+ return slowAdvance(target);
}
@Override
@@ -555,13 +554,12 @@ public class SortingAtomicReader extends
public int advance(final int target) throws IOException {
// need to support it for checkIndex, but in practice it won't be called, so
// don't bother to implement efficiently for now.
- while (nextDoc() < target) {}
- return docID();
+ return slowAdvance(target);
}
@Override
public int docID() {
- return docIt >= upto ? NO_MORE_DOCS : docs[docIt];
+ return docIt < 0 ? -1 : docIt >= upto ? NO_MORE_DOCS : docs[docIt];
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeFilter.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeFilter.java Thu Apr 4 21:49:26 2013
@@ -243,10 +243,7 @@ public class ContainsPrefixTreeFilter ex
public int advance(int target) throws IOException {
//for this small set this is likely faster vs. a binary search
// into the sorted array
- int doc;
- while ((doc = nextDoc()) < target) {
- }
- return doc;
+ return slowAdvance(target);
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java Thu Apr 4 21:49:26 2013
@@ -400,11 +400,8 @@ public final class RAMOnlyPostingsFormat
}
@Override
- public int advance(int targetDocID) {
- do {
- nextDoc();
- } while (upto < ramTerm.docs.size() && current.docID < targetDocID);
- return NO_MORE_DOCS;
+ public int advance(int targetDocID) throws IOException {
+ return slowAdvance(targetDocID);
}
// TODO: override bulk read, for better perf
@@ -453,11 +450,8 @@ public final class RAMOnlyPostingsFormat
}
@Override
- public int advance(int targetDocID) {
- do {
- nextDoc();
- } while (upto < ramTerm.docs.size() && current.docID < targetDocID);
- return NO_MORE_DOCS;
+ public int advance(int targetDocID) throws IOException {
+ return slowAdvance(targetDocID);
}
// TODO: override bulk read, for better perf
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java Thu Apr 4 21:49:26 2013
@@ -84,7 +84,7 @@ public class AssertingAtomicReader exten
@Override
public TermsEnum intersect(CompiledAutomaton automaton, BytesRef bytes) throws IOException {
- TermsEnum termsEnum = super.intersect(automaton, bytes);
+ TermsEnum termsEnum = in.intersect(automaton, bytes);
assert termsEnum != null;
assert bytes == null || bytes.isValid();
return new AssertingTermsEnum(termsEnum);
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java Thu Apr 4 21:49:26 2013
@@ -275,10 +275,8 @@ public abstract class BasePostingsFormat
}
@Override
- public int advance(int target) {
- while(nextDoc() < target) {
- }
- return docID;
+ public int advance(int target) throws IOException {
+ return slowAdvance(target);
}
@Override
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java Thu Apr 4 21:49:26 2013
@@ -184,11 +184,6 @@ public class SolrIndexSplitter {
}
@Override
- public boolean hasDeletions() {
- return (in.maxDoc() != numDocs);
- }
-
- @Override
public Bits getLiveDocs() {
return liveDocs;
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestDocSet.java?rev=1464776&r1=1464775&r2=1464776&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestDocSet.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestDocSet.java Thu Apr 4 21:49:26 2013
@@ -364,11 +364,6 @@ public class TestDocSet extends LuceneTe
}
@Override
- public boolean hasDeletions() {
- return false;
- }
-
- @Override
public FieldInfos getFieldInfos() {
return new FieldInfos(new FieldInfo[0]);
}