You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2015/02/21 16:02:47 UTC
svn commit: r1661376 - in /lucene/dev/trunk: lucene/
lucene/core/src/java/org/apache/lucene/search/
lucene/core/src/java/org/apache/lucene/search/spans/
lucene/core/src/test/org/apache/lucene/search/
lucene/expressions/src/java/org/apache/lucene/expres...
Author: romseygeek
Date: Sat Feb 21 15:02:46 2015
New Revision: 1661376
URL: http://svn.apache.org/r1661376
Log:
LUCENE-6272: Scorer extends DocIdSetIterator directly
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRangeQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FakeScorer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldValueQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/Filter.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/Scorer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TermScorer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConjunctionDISI.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
lucene/dev/trunk/lucene/expressions/src/java/org/apache/lucene/expressions/FakeScorer.java
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysScorer.java
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FakeScorer.java
lucene/dev/trunk/lucene/grouping/src/java/org/apache/lucene/search/grouping/FakeScorer.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/FakeScorer.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/Sorter.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/BulkScorerWrapperScorer.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/RandomApproximationQuery.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/LatLonType.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Sat Feb 21 15:02:46 2015
@@ -146,6 +146,9 @@ API Changes
* LUCENE-6266: Remove unnecessary Directory params from SegmentInfo.toString,
SegmentInfos.files/toString, and SegmentCommitInfo.toString. (Robert Muir)
+* LUCENE-6272: Scorer extends DocSetIdIterator rather than DocsEnum (Alan
+ Woodward)
+
Other
* LUCENE-6248: Remove unused odd constants from StandardSyntaxParser.jj
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java Sat Feb 21 15:02:46 2015
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.util.ArrayUtil;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.RamUsageEstimator;
/**
@@ -75,26 +74,6 @@ public abstract class CachingCollector e
public final int freq() { throw new UnsupportedOperationException(); }
@Override
- public int nextPosition() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int startOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int endOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
public final int nextDoc() { throw new UnsupportedOperationException(); }
@Override
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java Sat Feb 21 15:02:46 2015
@@ -22,8 +22,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.lucene.util.BytesRef;
-
/** Scorer for conjunctions, sets of queries, all of which are required. */
class ConjunctionScorer extends Scorer {
@@ -80,26 +78,6 @@ class ConjunctionScorer extends Scorer {
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public long cost() {
return disi.cost();
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java Sat Feb 21 15:02:46 2015
@@ -26,7 +26,6 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.ToStringUtils;
/**
@@ -236,26 +235,6 @@ public class ConstantScoreQuery extends
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public int advance(int target) throws IOException {
return docIdSetIterator.advance(target);
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java Sat Feb 21 15:02:46 2015
@@ -23,7 +23,6 @@ import java.util.Collection;
import java.util.List;
import org.apache.lucene.search.ScorerPriorityQueue.ScorerWrapper;
-import org.apache.lucene.util.BytesRef;
/**
* Base class for Scorers that score disjunctions.
@@ -232,23 +231,4 @@ abstract class DisjunctionScorer extends
return children;
}
- @Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRangeQuery.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRangeQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRangeQuery.java Sat Feb 21 15:02:46 2015
@@ -349,26 +349,6 @@ public final class DocValuesRangeQuery e
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public int docID() {
return disi.docID();
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java Sat Feb 21 15:02:46 2015
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.search.similarities.Similarity;
-import org.apache.lucene.util.BytesRef;
final class ExactPhraseScorer extends Scorer {
@@ -107,26 +106,6 @@ final class ExactPhraseScorer extends Sc
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public int docID() {
return conjunction.docID();
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FakeScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FakeScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FakeScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FakeScorer.java Sat Feb 21 15:02:46 2015
@@ -17,11 +17,8 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import java.io.IOException;
import java.util.Collection;
-import org.apache.lucene.util.BytesRef;
-
/** Used by {@link BulkScorer}s that need to pass a {@link
* Scorer} to {@link LeafCollector#setScorer}. */
final class FakeScorer extends Scorer {
@@ -49,26 +46,6 @@ final class FakeScorer extends Scorer {
}
@Override
- public int nextPosition() throws IOException {
- throw new UnsupportedOperationException("FakeScorer doesn't support nextPosition()");
- }
-
- @Override
- public int startOffset() throws IOException {
- throw new UnsupportedOperationException("FakeScorer doesn't support startOffset()");
- }
-
- @Override
- public int endOffset() throws IOException {
- throw new UnsupportedOperationException("FakeScorer doesn't support endOffset()");
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- throw new UnsupportedOperationException("FakeScorer doesn't support getPayload()");
- }
-
- @Override
public int nextDoc() {
throw new UnsupportedOperationException("FakeScorer doesn't support nextDoc()");
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldValueQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldValueQuery.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldValueQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldValueQuery.java Sat Feb 21 15:02:46 2015
@@ -24,7 +24,6 @@ import org.apache.lucene.index.LeafReade
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.Bits.MatchNoBits;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.ToStringUtils;
/**
@@ -156,31 +155,11 @@ public final class FieldValueQuery exten
}
@Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public int freq() throws IOException {
return 1;
}
@Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
public float score() throws IOException {
return queryWeight;
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/Filter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/Filter.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/Filter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/Filter.java Sat Feb 21 15:02:46 2015
@@ -21,7 +21,6 @@ import java.io.IOException;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
/**
* Convenient base class for building queries that only perform matching, but
@@ -124,26 +123,6 @@ public abstract class Filter extends Que
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public int docID() {
return iterator.docID();
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java Sat Feb 21 15:02:46 2015
@@ -19,9 +19,6 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.util.AttributeSource;
-import org.apache.lucene.util.BytesRef;
-
/**
* A {@code FilterScorer} contains another {@code Scorer}, which it
* uses as its basic source of data, possibly transforming the data along the
@@ -75,11 +72,6 @@ public abstract class FilterScorer exten
}
@Override
- public int nextPosition() throws IOException {
- return in.nextPosition();
- }
-
- @Override
public int advance(int target) throws IOException {
return in.advance(target);
}
@@ -89,23 +81,4 @@ public abstract class FilterScorer exten
return in.cost();
}
- @Override
- public int startOffset() throws IOException {
- return in.startOffset();
- }
-
- @Override
- public int endOffset() throws IOException {
- return in.endOffset();
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return in.getPayload();
- }
-
- @Override
- public AttributeSource attributes() {
- return in.attributes();
- }
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java Sat Feb 21 15:02:46 2015
@@ -24,7 +24,6 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.ToStringUtils;
/**
@@ -74,26 +73,6 @@ public class MatchAllDocsQuery extends Q
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public int advance(int target) throws IOException {
doc = target-1;
return nextDoc();
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java Sat Feb 21 15:02:46 2015
@@ -24,7 +24,6 @@ import java.util.Collections;
import java.util.List;
import org.apache.lucene.search.ScorerPriorityQueue.ScorerWrapper;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.PriorityQueue;
import static org.apache.lucene.search.ScorerPriorityQueue.leftNode;
@@ -230,26 +229,6 @@ final class MinShouldMatchSumScorer exte
}
}
- @Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
/** Advance tail to the lead until there is a match. */
private int doNext() throws IOException {
while (freq < minShouldMatch) {
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java Sat Feb 21 15:02:46 2015
@@ -20,8 +20,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.lucene.util.BytesRef;
-
/** A Scorer for queries with a required part and an optional part.
* Delays skipTo() on the optional part until a score() is needed.
* <br>
@@ -100,26 +98,6 @@ class ReqOptSumScorer extends Scorer {
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public Collection<ChildScorer> getChildren() {
ArrayList<ChildScorer> children = new ArrayList<>(2);
children.add(new ChildScorer(reqScorer, "MUST"));
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/Scorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/Scorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/Scorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/Scorer.java Sat Feb 21 15:02:46 2015
@@ -21,8 +21,6 @@ import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
-import org.apache.lucene.index.PostingsEnum;
-
/**
* Expert: Common scoring functionality for different types of queries.
*
@@ -41,7 +39,7 @@ import org.apache.lucene.index.PostingsE
* TopScoreDocCollector}) will not properly collect hits
* with these scores.
*/
-public abstract class Scorer extends PostingsEnum {
+public abstract class Scorer extends DocIdSetIterator {
/** the Scorer's parent Weight. in some cases this may be null */
// TODO can we clean this up?
protected final Weight weight;
@@ -61,6 +59,9 @@ public abstract class Scorer extends Pos
*/
public abstract float score() throws IOException;
+ /** Returns the freq of this Scorer on the current document */
+ public abstract int freq() throws IOException;
+
/** returns parent Weight
* @lucene.experimental
*/
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java Sat Feb 21 15:02:46 2015
@@ -27,7 +27,6 @@ import java.util.LinkedHashMap;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.similarities.Similarity;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.FixedBitSet;
final class SloppyPhraseScorer extends Scorer {
@@ -529,26 +528,6 @@ final class SloppyPhraseScorer extends S
return numMatches;
}
- @Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
float sloppyFreq() {
return sloppyFreq;
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TermScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TermScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TermScorer.java Sat Feb 21 15:02:46 2015
@@ -21,7 +21,6 @@ import java.io.IOException;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.search.similarities.Similarity;
-import org.apache.lucene.util.BytesRef;
/** Expert: A <code>Scorer</code> for documents matching a <code>Term</code>.
*/
@@ -56,26 +55,6 @@ final class TermScorer extends Scorer {
return postingsEnum.freq();
}
- @Override
- public int nextPosition() throws IOException {
- return postingsEnum.nextPosition();
- }
-
- @Override
- public int startOffset() throws IOException {
- return postingsEnum.startOffset();
- }
-
- @Override
- public int endOffset() throws IOException {
- return postingsEnum.endOffset();
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return postingsEnum.getPayload();
- }
-
/**
* Advances to the next document matching the query. <br>
*
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java Sat Feb 21 15:02:46 2015
@@ -22,7 +22,6 @@ import java.io.IOException;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Weight;
import org.apache.lucene.search.similarities.Similarity;
-import org.apache.lucene.util.BytesRef;
/**
* Public for extension only.
@@ -98,26 +97,6 @@ public class SpanScorer extends Scorer {
return numMatches;
}
- @Override
- public int nextPosition() throws IOException {
- throw new UnsupportedOperationException("SpanQueries do not support nextPosition() iteration");
- }
-
- @Override
- public int startOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int endOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- throw new UnsupportedOperationException();
- }
-
/** Returns the intermediate "sloppy freq" adjusted for edit distance
* @lucene.internal */
// only public so .payloads can see it.
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java Sat Feb 21 15:02:46 2015
@@ -23,7 +23,6 @@ import org.apache.lucene.index.FieldInve
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.PriorityQueue;
/**
@@ -199,26 +198,6 @@ final class JustCompileSearch {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
}
- @Override
- public int nextPosition() throws IOException {
- throw new UnsupportedOperationException(UNSUPPORTED_MSG);
- }
-
- @Override
- public int startOffset() throws IOException {
- throw new UnsupportedOperationException(UNSUPPORTED_MSG);
- }
-
- @Override
- public int endOffset() throws IOException {
- throw new UnsupportedOperationException(UNSUPPORTED_MSG);
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- throw new UnsupportedOperationException(UNSUPPORTED_MSG);
- }
-
@Override
public int docID() {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java Sat Feb 21 15:02:46 2015
@@ -19,7 +19,6 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
public class TestCachingCollector extends LuceneTestCase {
@@ -39,26 +38,6 @@ public class TestCachingCollector extend
public int freq() throws IOException { return 0; }
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public int docID() { return 0; }
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConjunctionDISI.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConjunctionDISI.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConjunctionDISI.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConjunctionDISI.java Sat Feb 21 15:02:46 2015
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.Arrays;
import org.apache.lucene.util.BitDocIdSet;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
@@ -105,26 +104,6 @@ public class TestConjunctionDISI extends
return 0;
}
- @Override
- public int nextPosition() throws IOException {
- return 0;
- }
-
- @Override
- public int startOffset() throws IOException {
- return 0;
- }
-
- @Override
- public int endOffset() throws IOException {
- return 0;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
};
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java Sat Feb 21 15:02:46 2015
@@ -356,26 +356,6 @@ public class TestMinShouldMatch2 extends
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public int docID() {
return currentDoc;
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java Sat Feb 21 15:02:46 2015
@@ -17,14 +17,11 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import java.io.IOException;
-
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
public class TestPositiveScoresOnlyCollector extends LuceneTestCase {
@@ -44,26 +41,6 @@ public class TestPositiveScoresOnlyColle
return 1;
}
- @Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
@Override public int docID() { return idx; }
@Override public int nextDoc() {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java Sat Feb 21 15:02:46 2015
@@ -36,7 +36,6 @@ import org.apache.lucene.search.spans.Sp
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
@@ -455,26 +454,6 @@ public class TestQueryRescorer extends L
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public long cost() {
return 1;
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java Sat Feb 21 15:02:46 2015
@@ -23,7 +23,6 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
public class TestScoreCachingWrappingScorer extends LuceneTestCase {
@@ -48,26 +47,6 @@ public class TestScoreCachingWrappingSco
return 1;
}
- @Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
@Override public int docID() { return doc; }
@Override public int nextDoc() {
Modified: lucene/dev/trunk/lucene/expressions/src/java/org/apache/lucene/expressions/FakeScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/expressions/src/java/org/apache/lucene/expressions/FakeScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/expressions/src/java/org/apache/lucene/expressions/FakeScorer.java (original)
+++ lucene/dev/trunk/lucene/expressions/src/java/org/apache/lucene/expressions/FakeScorer.java Sat Feb 21 15:02:46 2015
@@ -20,7 +20,6 @@ package org.apache.lucene.expressions;
import java.io.IOException;
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.util.BytesRef;
class FakeScorer extends Scorer {
@@ -58,26 +57,6 @@ class FakeScorer extends Scorer {
}
@Override
- public int nextPosition() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int startOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int endOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
public float score() throws IOException {
return score;
}
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysScorer.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysScorer.java Sat Feb 21 15:02:46 2015
@@ -21,8 +21,8 @@ import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
-import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.search.BulkScorer;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.DocIdSetIterator;
@@ -30,7 +30,6 @@ import org.apache.lucene.search.LeafColl
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.FixedBitSet;
class DrillSidewaysScorer extends BulkScorer {
@@ -654,26 +653,6 @@ class DrillSidewaysScorer extends BulkSc
}
@Override
- public int nextPosition() throws IOException {
- throw new UnsupportedOperationException("FakeScorer doesn't support nextPosition()");
- }
-
- @Override
- public int startOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int endOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
public int nextDoc() {
throw new UnsupportedOperationException("FakeScorer doesn't support nextDoc()");
}
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FakeScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FakeScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FakeScorer.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FakeScorer.java Sat Feb 21 15:02:46 2015
@@ -20,7 +20,6 @@ package org.apache.lucene.facet.taxonomy
import java.io.IOException;
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.util.BytesRef;
class FakeScorer extends Scorer {
@@ -58,26 +57,6 @@ class FakeScorer extends Scorer {
}
@Override
- public int nextPosition() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int startOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int endOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
public float score() throws IOException {
return score;
}
Modified: lucene/dev/trunk/lucene/grouping/src/java/org/apache/lucene/search/grouping/FakeScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/java/org/apache/lucene/search/grouping/FakeScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/java/org/apache/lucene/search/grouping/FakeScorer.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/java/org/apache/lucene/search/grouping/FakeScorer.java Sat Feb 21 15:02:46 2015
@@ -20,7 +20,6 @@ package org.apache.lucene.search.groupin
import java.io.IOException;
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.util.BytesRef;
class FakeScorer extends Scorer {
@@ -58,26 +57,6 @@ class FakeScorer extends Scorer {
}
@Override
- public int nextPosition() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int startOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int endOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
public float score() throws IOException {
return score;
}
Modified: lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/FakeScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/FakeScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/FakeScorer.java (original)
+++ lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/FakeScorer.java Sat Feb 21 15:02:46 2015
@@ -20,7 +20,6 @@ package org.apache.lucene.search.join;
import java.io.IOException;
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.util.BytesRef;
class FakeScorer extends Scorer {
@@ -58,26 +57,6 @@ class FakeScorer extends Scorer {
}
@Override
- public int nextPosition() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int startOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int endOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
public float score() throws IOException {
return score;
}
Modified: lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java (original)
+++ lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java Sat Feb 21 15:02:46 2015
@@ -21,9 +21,9 @@ import java.io.IOException;
import java.util.Locale;
import java.util.Set;
-import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
@@ -225,26 +225,6 @@ class TermsIncludingScoreQuery extends Q
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public int docID() {
return currentDoc;
}
Modified: lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java (original)
+++ lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java Sat Feb 21 15:02:46 2015
@@ -33,7 +33,6 @@ import org.apache.lucene.search.Weight;
import org.apache.lucene.util.BitDocIdSet;
import org.apache.lucene.util.BitSet;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
/**
* Just like {@link ToParentBlockJoinQuery}, except this
@@ -265,26 +264,6 @@ public class ToChildBlockJoinQuery exten
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public int advance(int childTarget) throws IOException {
//System.out.println("Q.advance childTarget=" + childTarget);
Modified: lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java (original)
+++ lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java Sat Feb 21 15:02:46 2015
@@ -39,7 +39,6 @@ import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.BitDocIdSet;
import org.apache.lucene.util.BitSet;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
/**
* This query requires that you index
@@ -366,26 +365,6 @@ public class ToParentBlockJoinQuery exte
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public int advance(int parentTarget) throws IOException {
//System.out.println("Q.advance parentTarget=" + parentTarget);
Modified: lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/Sorter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/Sorter.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/Sorter.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/Sorter.java Sat Feb 21 15:02:46 2015
@@ -24,7 +24,6 @@ import org.apache.lucene.search.LeafFiel
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.TimSorter;
import org.apache.lucene.util.packed.PackedInts;
import org.apache.lucene.util.packed.PackedLongValues;
@@ -291,26 +290,6 @@ final class Sorter {
}
@Override
- public int nextPosition() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int startOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int endOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
public float score() throws IOException {
return score;
}
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java Sat Feb 21 15:02:46 2015
@@ -35,7 +35,6 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.ToStringUtils;
/**
@@ -326,26 +325,6 @@ public class CustomScoreQuery extends Qu
}
@Override
- public int nextPosition() throws IOException {
- return subQueryScorer.nextPosition();
- }
-
- @Override
- public int startOffset() throws IOException {
- return subQueryScorer.startOffset();
- }
-
- @Override
- public int endOffset() throws IOException {
- return subQueryScorer.endOffset();
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return subQueryScorer.getPayload();
- }
-
- @Override
public Collection<ChildScorer> getChildren() {
return Collections.singleton(new ChildScorer(subQueryScorer, "CUSTOM"));
}
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java Sat Feb 21 15:02:46 2015
@@ -31,7 +31,6 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
/**
@@ -168,26 +167,6 @@ public class FunctionQuery extends Query
return 1;
}
- @Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
public Explanation explain(int doc) throws IOException {
float sc = qWeight * vals.floatVal(doc);
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java Sat Feb 21 15:02:46 2015
@@ -23,7 +23,6 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
/**
* {@link Scorer} which returns the result of {@link FunctionValues#floatVal(int)} as
@@ -94,26 +93,6 @@ public class ValueSourceScorer extends S
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public long cost() {
return maxDoc;
}
Modified: lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java Sat Feb 21 15:02:46 2015
@@ -326,26 +326,6 @@ class TermAutomatonScorer extends Scorer
}
@Override
- public int nextPosition() throws IOException {
- return -1; // TODO can we get positional information out of this Scorer?
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public int docID() {
return docID;
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java Sat Feb 21 15:02:46 2015
@@ -25,12 +25,11 @@ import java.util.Map;
import java.util.Random;
import java.util.WeakHashMap;
-import org.apache.lucene.index.AssertingLeafReader;
-import org.apache.lucene.util.BytesRef;
-
/** Wraps a Scorer with additional checks */
public class AssertingScorer extends Scorer {
+ static enum IteratorState { START, ITERATING, FINISHED };
+
// we need to track scorers using a weak hash map because otherwise we
// could loose references because of eg.
// AssertingScorer.score(Collector) which needs to delegate to work correctly
@@ -64,13 +63,14 @@ public class AssertingScorer extends Sco
final Random random;
final Scorer in;
- final AssertingLeafReader.AssertingPostingsEnum docsEnumIn;
+
+ IteratorState state = IteratorState.START;
+ int doc = -1;
private AssertingScorer(Random random, Scorer in) {
super(in.weight);
this.random = random;
this.in = in;
- this.docsEnumIn = new AssertingLeafReader.AssertingPostingsEnum(in);
}
public Scorer getIn() {
@@ -112,42 +112,37 @@ public class AssertingScorer extends Sco
}
@Override
- public int nextPosition() throws IOException {
- assert iterating();
- return in.nextPosition();
- }
-
- @Override
- public int startOffset() throws IOException {
- assert iterating();
- return in.startOffset();
- }
-
- @Override
- public int endOffset() throws IOException {
- assert iterating();
- return in.endOffset();
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- assert iterating();
- return in.getPayload();
- }
-
- @Override
public int docID() {
return in.docID();
}
@Override
public int nextDoc() throws IOException {
- return docsEnumIn.nextDoc();
+ assert state != IteratorState.FINISHED : "nextDoc() called after NO_MORE_DOCS";
+ int nextDoc = in.nextDoc();
+ assert nextDoc > doc : "backwards nextDoc from " + doc + " to " + nextDoc + " " + in;
+ if (nextDoc == DocIdSetIterator.NO_MORE_DOCS) {
+ state = IteratorState.FINISHED;
+ } else {
+ state = IteratorState.ITERATING;
+ }
+ assert in.docID() == nextDoc;
+ return doc = nextDoc;
}
@Override
public int advance(int target) throws IOException {
- return docsEnumIn.advance(target);
+ assert state != IteratorState.FINISHED : "advance() called after NO_MORE_DOCS";
+ assert target > doc : "target must be > docID(), got " + target + " <= " + doc;
+ int advanced = in.advance(target);
+ assert advanced >= target : "backwards advance from: " + target + " to: " + advanced;
+ if (advanced == DocIdSetIterator.NO_MORE_DOCS) {
+ state = IteratorState.FINISHED;
+ } else {
+ state = IteratorState.ITERATING;
+ }
+ assert in.docID() == advanced;
+ return doc = advanced;
}
@Override
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/BulkScorerWrapperScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/BulkScorerWrapperScorer.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/BulkScorerWrapperScorer.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/BulkScorerWrapperScorer.java Sat Feb 21 15:02:46 2015
@@ -20,8 +20,6 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.Arrays;
-import org.apache.lucene.util.BytesRef;
-
/**
* A {@link BulkScorer}-backed scorer.
*/
@@ -81,26 +79,6 @@ public class BulkScorerWrapperScorer ext
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public int docID() {
return doc;
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/RandomApproximationQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/RandomApproximationQuery.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/RandomApproximationQuery.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/RandomApproximationQuery.java Sat Feb 21 15:02:46 2015
@@ -1,6 +1,13 @@
package org.apache.lucene.search;
import java.io.IOException;
+import java.util.Random;
+
+import com.carrotsearch.randomizedtesting.generators.RandomInts;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.util.Bits;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -17,14 +24,6 @@ import java.io.IOException;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import java.util.Random;
-
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.LeafReaderContext;
-import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
-
-import com.carrotsearch.randomizedtesting.generators.RandomInts;
/**
* A {@link Query} that adds random approximations to its scorers.
@@ -143,26 +142,6 @@ public class RandomApproximationQuery ex
}
@Override
- public int nextPosition() throws IOException {
- return scorer.nextPosition();
- }
-
- @Override
- public int startOffset() throws IOException {
- return scorer.startOffset();
- }
-
- @Override
- public int endOffset() throws IOException {
- return scorer.endOffset();
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return scorer.getPayload();
- }
-
- @Override
public int docID() {
return scorer.docID();
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java Sat Feb 21 15:02:46 2015
@@ -1350,26 +1350,6 @@ public class QueryComponent extends Sear
}
@Override
- public int nextPosition() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int startOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int endOffset() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
public int nextDoc() throws IOException {
throw new UnsupportedOperationException();
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/LatLonType.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/LatLonType.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/LatLonType.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/LatLonType.java Sat Feb 21 15:02:46 2015
@@ -44,7 +44,6 @@ import org.apache.lucene.search.SortFiel
import org.apache.lucene.search.Weight;
import org.apache.lucene.uninverting.UninvertingReader.Type;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.SolrException;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.DelegatingCollector;
@@ -483,26 +482,6 @@ class SpatialDistanceQuery extends Exten
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public long cost() {
return maxDoc;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java Sat Feb 21 15:02:46 2015
@@ -365,26 +365,6 @@ public class CollapsingQParserPlugin ext
return 0;
}
- @Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
public int advance(int i) {
return -1;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java Sat Feb 21 15:02:46 2015
@@ -623,26 +623,6 @@ class JoinQuery extends Query {
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public int advance(int target) throws IOException {
return iter.advance(target);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java Sat Feb 21 15:02:46 2015
@@ -18,7 +18,6 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.SolrException;
/*
@@ -199,26 +198,6 @@ public class SolrConstantScoreQuery exte
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public int advance(int target) throws IOException {
return docIdSetIterator.advance(target);
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java?rev=1661376&r1=1661375&r2=1661376&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java Sat Feb 21 15:02:46 2015
@@ -35,9 +35,9 @@ import org.apache.lucene.index.NumericDo
import org.apache.lucene.index.ReaderUtil;
import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
import org.apache.lucene.search.LeafCollector;
import org.apache.lucene.search.LeafFieldComparator;
+import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Sort;
@@ -45,7 +45,6 @@ import org.apache.lucene.search.SortFiel
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.TopDocsCollector;
import org.apache.lucene.search.Weight;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.InPlaceMergeSorter;
import org.apache.lucene.util.PriorityQueue;
import org.apache.solr.client.solrj.SolrServerException;
@@ -478,26 +477,6 @@ public class TestRankQueryPlugin extends
}
@Override
- public int nextPosition() throws IOException {
- return -1;
- }
-
- @Override
- public int startOffset() throws IOException {
- return -1;
- }
-
- @Override
- public int endOffset() throws IOException {
- return -1;
- }
-
- @Override
- public BytesRef getPayload() throws IOException {
- return null;
- }
-
- @Override
public int nextDoc() throws IOException {
throw new UnsupportedOperationException();
}