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 2015/02/26 11:52:52 UTC
svn commit: r1662414 - in /lucene/dev/trunk/lucene: ./
core/src/java/org/apache/lucene/search/
core/src/test/org/apache/lucene/search/
test-framework/src/java/org/apache/lucene/search/
Author: jpountz
Date: Thu Feb 26 10:52:51 2015
New Revision: 1662414
URL: http://svn.apache.org/r1662414
Log:
LUCENE-6291: Rename TwoPhaseDocIdSetIterator to TwoPhaseIterator.
Added:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.java (with props)
Removed:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TwoPhaseDocIdSetIterator.java
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanTopLevelScorers.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConjunctionDISI.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/DocValuesTermsQuery.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/FieldValueQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.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/ScorerPriorityQueue.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConjunctionDISI.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/RandomApproximationQuery.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1662414&r1=1662413&r2=1662414&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Thu Feb 26 10:52:51 2015
@@ -86,7 +86,7 @@ Optimizations
* LUCENE-6233 Speed up CheckIndex when the index has term vectors
(Robert Muir, Mike McCandless)
-* LUCENE-6198: Added the TwoPhaseDocIdSetIterator API, exposed on scorers which
+* LUCENE-6198: Added the TwoPhaseIterator API, exposed on scorers which
is for now only used on phrase queries and conjunctions in order to check
positions lazily if the phrase query is in a conjunction with other queries.
(Robert Muir, Adrien Grand)
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanTopLevelScorers.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanTopLevelScorers.java?rev=1662414&r1=1662413&r2=1662414&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanTopLevelScorers.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanTopLevelScorers.java Thu Feb 26 10:52:51 2015
@@ -39,7 +39,7 @@ class BooleanTopLevelScorers {
}
@Override
- public TwoPhaseDocIdSetIterator asTwoPhaseIterator() {
+ public TwoPhaseIterator asTwoPhaseIterator() {
return in.asTwoPhaseIterator();
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConjunctionDISI.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConjunctionDISI.java?rev=1662414&r1=1662413&r2=1662414&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConjunctionDISI.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConjunctionDISI.java Thu Feb 26 10:52:51 2015
@@ -27,14 +27,14 @@ import org.apache.lucene.util.Collection
class ConjunctionDISI extends DocIdSetIterator {
/** Create a conjunction over the provided iterators, taking advantage of
- * {@link TwoPhaseDocIdSetIterator}. */
+ * {@link TwoPhaseIterator}. */
public static ConjunctionDISI intersect(List<? extends DocIdSetIterator> iterators) {
final List<DocIdSetIterator> allIterators = new ArrayList<>();
- final List<TwoPhaseDocIdSetIterator> twoPhaseIterators = new ArrayList<>();
+ final List<TwoPhaseIterator> twoPhaseIterators = new ArrayList<>();
for (DocIdSetIterator iterator : iterators) {
if (iterator instanceof Scorer) {
// if we have a scorer, check if it supports two-phase iteration
- TwoPhaseDocIdSetIterator twoPhaseIterator = ((Scorer) iterator).asTwoPhaseIterator();
+ TwoPhaseIterator twoPhaseIterator = ((Scorer) iterator).asTwoPhaseIterator();
if (twoPhaseIterator != null) {
// Note:
allIterators.add(twoPhaseIterator.approximation());
@@ -75,7 +75,7 @@ class ConjunctionDISI extends DocIdSetIt
return true;
}
- TwoPhaseDocIdSetIterator asTwoPhaseIterator() {
+ TwoPhaseIterator asTwoPhaseIterator() {
return null;
}
@@ -136,17 +136,17 @@ class ConjunctionDISI extends DocIdSetIt
}
/**
- * {@link TwoPhaseDocIdSetIterator} view of a {@link TwoPhase} conjunction.
+ * {@link TwoPhaseIterator} view of a {@link TwoPhase} conjunction.
*/
- private static class TwoPhaseConjunctionDISI extends TwoPhaseDocIdSetIterator {
+ private static class TwoPhaseConjunctionDISI extends TwoPhaseIterator {
private final ConjunctionDISI approximation;
- private final TwoPhaseDocIdSetIterator[] twoPhaseIterators;
+ private final TwoPhaseIterator[] twoPhaseIterators;
- private TwoPhaseConjunctionDISI(List<? extends DocIdSetIterator> iterators, List<TwoPhaseDocIdSetIterator> twoPhaseIterators) {
+ private TwoPhaseConjunctionDISI(List<? extends DocIdSetIterator> iterators, List<TwoPhaseIterator> twoPhaseIterators) {
approximation = new ConjunctionDISI(iterators);
assert twoPhaseIterators.size() > 0;
- this.twoPhaseIterators = twoPhaseIterators.toArray(new TwoPhaseDocIdSetIterator[0]);
+ this.twoPhaseIterators = twoPhaseIterators.toArray(new TwoPhaseIterator[0]);
}
@Override
@@ -156,7 +156,7 @@ class ConjunctionDISI extends DocIdSetIt
@Override
public boolean matches() throws IOException {
- for (TwoPhaseDocIdSetIterator twoPhaseIterator : twoPhaseIterators) {
+ for (TwoPhaseIterator twoPhaseIterator : twoPhaseIterators) {
if (twoPhaseIterator.matches() == false) {
return false;
}
@@ -169,7 +169,7 @@ class ConjunctionDISI extends DocIdSetIt
/**
* A conjunction DISI built on top of approximations. This implementation
* verifies that documents actually match by consulting the provided
- * {@link TwoPhaseDocIdSetIterator}s.
+ * {@link TwoPhaseIterator}s.
*
* Another important difference with {@link ConjunctionDISI} is that this
* implementation supports approximations too: the approximation of this
@@ -183,7 +183,7 @@ class ConjunctionDISI extends DocIdSetIt
final TwoPhaseConjunctionDISI twoPhaseView;
- private TwoPhase(List<? extends DocIdSetIterator> iterators, List<TwoPhaseDocIdSetIterator> twoPhaseIterators) {
+ private TwoPhase(List<? extends DocIdSetIterator> iterators, List<TwoPhaseIterator> twoPhaseIterators) {
super(iterators);
twoPhaseView = new TwoPhaseConjunctionDISI(iterators, twoPhaseIterators);
}
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=1662414&r1=1662413&r2=1662414&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 Thu Feb 26 10:52:51 2015
@@ -43,7 +43,7 @@ class ConjunctionScorer extends Scorer {
}
@Override
- public TwoPhaseDocIdSetIterator asTwoPhaseIterator() {
+ public TwoPhaseIterator asTwoPhaseIterator() {
return disi.asTwoPhaseIterator();
}
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=1662414&r1=1662413&r2=1662414&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 Thu Feb 26 10:52:51 2015
@@ -183,7 +183,7 @@ public class ConstantScoreQuery extends
}
@Override
- public TwoPhaseDocIdSetIterator asTwoPhaseIterator() {
+ public TwoPhaseIterator asTwoPhaseIterator() {
return in.asTwoPhaseIterator();
}
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=1662414&r1=1662413&r2=1662414&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 Thu Feb 26 10:52:51 2015
@@ -105,7 +105,7 @@ abstract class DisjunctionScorer extends
}
@Override
- public TwoPhaseDocIdSetIterator asTwoPhaseIterator() {
+ public TwoPhaseIterator asTwoPhaseIterator() {
boolean hasApproximation = false;
for (ScorerWrapper w : subScorers) {
if (w.twoPhaseView != null) {
@@ -119,7 +119,7 @@ abstract class DisjunctionScorer extends
return null;
}
- return new TwoPhaseDocIdSetIterator() {
+ return new TwoPhaseIterator() {
@Override
public DocIdSetIterator approximation() {
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=1662414&r1=1662413&r2=1662414&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 Thu Feb 26 10:52:51 2015
@@ -134,7 +134,7 @@ public final class DocValuesRangeQuery e
}
final DocIdSetIterator approximation = DocIdSetIterator.all(context.reader().maxDoc());
- final TwoPhaseDocIdSetIterator twoPhaseRange;
+ final TwoPhaseIterator twoPhaseRange;
if (lowerVal instanceof Long || upperVal instanceof Long) {
final SortedNumericDocValues values = DocValues.getSortedNumeric(context.reader(), field);
@@ -211,7 +211,7 @@ public final class DocValuesRangeQuery e
};
}
- private static class TwoPhaseNumericRange extends TwoPhaseDocIdSetIterator {
+ private static class TwoPhaseNumericRange extends TwoPhaseIterator {
private final DocIdSetIterator approximation;
private final SortedNumericDocValues values;
@@ -249,7 +249,7 @@ public final class DocValuesRangeQuery e
}
- private static class TwoPhaseOrdRange extends TwoPhaseDocIdSetIterator {
+ private static class TwoPhaseOrdRange extends TwoPhaseIterator {
private final DocIdSetIterator approximation;
private final SortedSetDocValues values;
@@ -287,19 +287,19 @@ public final class DocValuesRangeQuery e
private static class RangeScorer extends Scorer {
- private final TwoPhaseDocIdSetIterator twoPhaseRange;
+ private final TwoPhaseIterator twoPhaseRange;
private final DocIdSetIterator disi;
private final float score;
- RangeScorer(Weight weight, TwoPhaseDocIdSetIterator twoPhaseRange, float score) {
+ RangeScorer(Weight weight, TwoPhaseIterator twoPhaseRange, float score) {
super(weight);
this.twoPhaseRange = twoPhaseRange;
- this.disi = TwoPhaseDocIdSetIterator.asDocIdSetIterator(twoPhaseRange);
+ this.disi = TwoPhaseIterator.asDocIdSetIterator(twoPhaseRange);
this.score = score;
}
@Override
- public TwoPhaseDocIdSetIterator asTwoPhaseIterator() {
+ public TwoPhaseIterator asTwoPhaseIterator() {
return twoPhaseRange;
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java?rev=1662414&r1=1662413&r2=1662414&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java Thu Feb 26 10:52:51 2015
@@ -160,7 +160,7 @@ public class DocValuesTermsQuery extends
}
final DocIdSetIterator approximation = DocIdSetIterator.all(context.reader().maxDoc());
- final TwoPhaseDocIdSetIterator twoPhaseIterator = new TwoPhaseDocIdSetIterator() {
+ final TwoPhaseIterator twoPhaseIterator = new TwoPhaseIterator() {
@Override
public DocIdSetIterator approximation() {
return approximation;
@@ -180,11 +180,11 @@ public class DocValuesTermsQuery extends
return false;
}
};
- final DocIdSetIterator disi = TwoPhaseDocIdSetIterator.asDocIdSetIterator(twoPhaseIterator);
+ final DocIdSetIterator disi = TwoPhaseIterator.asDocIdSetIterator(twoPhaseIterator);
return new Scorer(this) {
@Override
- public TwoPhaseDocIdSetIterator asTwoPhaseIterator() {
+ public TwoPhaseIterator asTwoPhaseIterator() {
return twoPhaseIterator;
}
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=1662414&r1=1662413&r2=1662414&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 Thu Feb 26 10:52:51 2015
@@ -62,8 +62,8 @@ final class ExactPhraseScorer extends Sc
}
@Override
- public TwoPhaseDocIdSetIterator asTwoPhaseIterator() {
- return new TwoPhaseDocIdSetIterator() {
+ public TwoPhaseIterator asTwoPhaseIterator() {
+ return new TwoPhaseIterator() {
@Override
public boolean matches() throws IOException {
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=1662414&r1=1662413&r2=1662414&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 Thu Feb 26 10:52:51 2015
@@ -71,7 +71,7 @@ public final class FieldValueQuery exten
}
final DocIdSetIterator approximation = DocIdSetIterator.all(context.reader().maxDoc());
- final TwoPhaseDocIdSetIterator twoPhaseIterator = new TwoPhaseDocIdSetIterator() {
+ final TwoPhaseIterator twoPhaseIterator = new TwoPhaseIterator() {
@Override
public boolean matches() throws IOException {
@@ -90,12 +90,12 @@ public final class FieldValueQuery exten
return approximation;
}
};
- final DocIdSetIterator disi = TwoPhaseDocIdSetIterator.asDocIdSetIterator(twoPhaseIterator);
+ final DocIdSetIterator disi = TwoPhaseIterator.asDocIdSetIterator(twoPhaseIterator);
return new Scorer(this) {
@Override
- public TwoPhaseDocIdSetIterator asTwoPhaseIterator() {
+ public TwoPhaseIterator asTwoPhaseIterator() {
return twoPhaseIterator;
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java?rev=1662414&r1=1662413&r2=1662414&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java Thu Feb 26 10:52:51 2015
@@ -34,8 +34,8 @@ class ReqExclScorer extends FilterScorer
private final DocIdSetIterator reqApproximation;
private final DocIdSetIterator exclApproximation;
// two-phase views of the scorers, or null if they do not support approximations
- private final TwoPhaseDocIdSetIterator reqTwoPhaseIterator;
- private final TwoPhaseDocIdSetIterator exclTwoPhaseIterator;
+ private final TwoPhaseIterator reqTwoPhaseIterator;
+ private final TwoPhaseIterator exclTwoPhaseIterator;
/** Construct a <code>ReqExclScorer</code>.
* @param reqScorer The scorer that must match, except where
@@ -63,9 +63,9 @@ class ReqExclScorer extends FilterScorer
return toNonExcluded(reqApproximation.nextDoc());
}
- /** Confirms whether or not the given {@link TwoPhaseDocIdSetIterator}
+ /** Confirms whether or not the given {@link TwoPhaseIterator}
* matches on the current document. */
- private static boolean matches(TwoPhaseDocIdSetIterator it) throws IOException {
+ private static boolean matches(TwoPhaseIterator it) throws IOException {
return it == null || it.matches();
}
@@ -76,8 +76,8 @@ class ReqExclScorer extends FilterScorer
* - it does NOT call matches() on req if the excl approximation is exact
* and is on the same doc ID as the req approximation */
private static boolean matches(int doc, int exclDoc,
- TwoPhaseDocIdSetIterator reqTwoPhaseIterator,
- TwoPhaseDocIdSetIterator exclTwoPhaseIterator) throws IOException {
+ TwoPhaseIterator reqTwoPhaseIterator,
+ TwoPhaseIterator exclTwoPhaseIterator) throws IOException {
assert exclDoc >= doc;
if (doc == exclDoc && matches(exclTwoPhaseIterator)) {
return false;
@@ -126,11 +126,11 @@ class ReqExclScorer extends FilterScorer
}
@Override
- public TwoPhaseDocIdSetIterator asTwoPhaseIterator() {
+ public TwoPhaseIterator asTwoPhaseIterator() {
if (reqTwoPhaseIterator == null) {
return null;
}
- return new TwoPhaseDocIdSetIterator() {
+ return new TwoPhaseIterator() {
@Override
public DocIdSetIterator approximation() {
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=1662414&r1=1662413&r2=1662414&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 Thu Feb 26 10:52:51 2015
@@ -48,7 +48,7 @@ class ReqOptSumScorer extends Scorer {
}
@Override
- public TwoPhaseDocIdSetIterator asTwoPhaseIterator() {
+ public TwoPhaseIterator asTwoPhaseIterator() {
return reqScorer.asTwoPhaseIterator();
}
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=1662414&r1=1662413&r2=1662414&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 Thu Feb 26 10:52:51 2015
@@ -102,12 +102,12 @@ public abstract class Scorer extends Doc
}
/**
- * Optional method: Return a {@link TwoPhaseDocIdSetIterator} view of this
+ * Optional method: Return a {@link TwoPhaseIterator} view of this
* {@link Scorer}. A return value of {@code null} indicates that
* two-phase iteration is not supported.
*
- * Note that the returned {@link TwoPhaseDocIdSetIterator}'s
- * {@link TwoPhaseDocIdSetIterator#approximation() approximation} must
+ * Note that the returned {@link TwoPhaseIterator}'s
+ * {@link TwoPhaseIterator#approximation() approximation} must
* advance synchronously with this iterator: advancing the approximation must
* advance this iterator and vice-versa.
*
@@ -116,7 +116,7 @@ public abstract class Scorer extends Doc
*
* The default implementation returns {@code null}.
*/
- public TwoPhaseDocIdSetIterator asTwoPhaseIterator() {
+ public TwoPhaseIterator asTwoPhaseIterator() {
return null;
}
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ScorerPriorityQueue.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ScorerPriorityQueue.java?rev=1662414&r1=1662413&r2=1662414&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ScorerPriorityQueue.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ScorerPriorityQueue.java Thu Feb 26 10:52:51 2015
@@ -40,7 +40,7 @@ final class ScorerPriorityQueue implemen
final DocIdSetIterator approximation;
// A two-phase view of the scorer, or null if the scorer does not support
// two-phase iteration
- final TwoPhaseDocIdSetIterator twoPhaseView;
+ final TwoPhaseIterator twoPhaseView;
ScorerWrapper(Scorer scorer) {
this.scorer = scorer;
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=1662414&r1=1662413&r2=1662414&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 Thu Feb 26 10:52:51 2015
@@ -589,8 +589,8 @@ final class SloppyPhraseScorer extends S
public String toString() { return "scorer(" + weight + ")"; }
@Override
- public TwoPhaseDocIdSetIterator asTwoPhaseIterator() {
- return new TwoPhaseDocIdSetIterator() {
+ public TwoPhaseIterator asTwoPhaseIterator() {
+ return new TwoPhaseIterator() {
@Override
public DocIdSetIterator approximation() {
return conjunction;
Added: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.java?rev=1662414&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.java (added)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.java Thu Feb 26 10:52:51 2015
@@ -0,0 +1,81 @@
+package org.apache.lucene.search;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.IOException;
+
+/**
+ * An approximation of a {@link DocIdSetIterator}. When the {@link #approximation()}'s
+ * {@link DocIdSetIterator#nextDoc()} or {@link DocIdSetIterator#advance(int)}
+ * return, {@link #matches()} needs to be checked in order to know whether the
+ * returned doc ID actually matches.
+ * @lucene.experimental
+ */
+public abstract class TwoPhaseIterator {
+
+ /** Return a {@link DocIdSetIterator} view of the provided
+ * {@link TwoPhaseIterator}. */
+ public static DocIdSetIterator asDocIdSetIterator(TwoPhaseIterator twoPhaseIterator) {
+ final DocIdSetIterator approximation = twoPhaseIterator.approximation();
+ return new DocIdSetIterator() {
+
+ @Override
+ public int docID() {
+ return approximation.docID();
+ }
+
+ @Override
+ public int nextDoc() throws IOException {
+ return doNext(approximation.nextDoc());
+ }
+
+ @Override
+ public int advance(int target) throws IOException {
+ return doNext(approximation.advance(target));
+ }
+
+ private int doNext(int doc) throws IOException {
+ for (;; doc = approximation.nextDoc()) {
+ if (doc == NO_MORE_DOCS) {
+ return NO_MORE_DOCS;
+ } else if (twoPhaseIterator.matches()) {
+ return doc;
+ }
+ }
+ }
+
+ @Override
+ public long cost() {
+ return approximation.cost();
+ }
+
+ };
+ }
+
+ /** Return an approximation. The returned {@link DocIdSetIterator} is a
+ * superset of the matching documents, and each match needs to be confirmed
+ * with {@link #matches()} in order to know whether it matches or not. */
+ public abstract DocIdSetIterator approximation();
+
+ /** Return whether the current doc ID that the iterator is on matches. This
+ * method should only be called when the iterator is positionned -- ie. not
+ * when {@link DocIdSetIterator#docID()} is {@code -1} or
+ * {@link DocIdSetIterator#NO_MORE_DOCS} -- and at most once. */
+ public abstract boolean matches() throws IOException;
+
+}
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=1662414&r1=1662413&r2=1662414&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 Thu Feb 26 10:52:51 2015
@@ -27,8 +27,8 @@ import org.apache.lucene.util.TestUtil;
public class TestConjunctionDISI extends LuceneTestCase {
- private static TwoPhaseDocIdSetIterator approximation(final DocIdSetIterator iterator, final FixedBitSet confirmed) {
- return new TwoPhaseDocIdSetIterator() {
+ private static TwoPhaseIterator approximation(final DocIdSetIterator iterator, final FixedBitSet confirmed) {
+ return new TwoPhaseIterator() {
@Override
public DocIdSetIterator approximation() {
@@ -42,23 +42,23 @@ public class TestConjunctionDISI extends
};
}
- private static Scorer scorer(TwoPhaseDocIdSetIterator twoPhaseIterator) {
- return scorer(TwoPhaseDocIdSetIterator.asDocIdSetIterator(twoPhaseIterator), twoPhaseIterator);
+ private static Scorer scorer(TwoPhaseIterator twoPhaseIterator) {
+ return scorer(TwoPhaseIterator.asDocIdSetIterator(twoPhaseIterator), twoPhaseIterator);
}
/**
* Create a {@link Scorer} that wraps the given {@link DocIdSetIterator}. It
- * also accepts a {@link TwoPhaseDocIdSetIterator} view, which is exposed in
+ * also accepts a {@link TwoPhaseIterator} view, which is exposed in
* {@link Scorer#asTwoPhaseIterator()}. When the two-phase view is not null,
* then {@link Scorer#nextDoc()} and {@link Scorer#advance(int)} will raise
* an exception in order to make sure that {@link ConjunctionDISI} takes
- * advantage of the {@link TwoPhaseDocIdSetIterator} view.
+ * advantage of the {@link TwoPhaseIterator} view.
*/
- private static Scorer scorer(DocIdSetIterator it, TwoPhaseDocIdSetIterator twoPhaseIterator) {
+ private static Scorer scorer(DocIdSetIterator it, TwoPhaseIterator twoPhaseIterator) {
return new Scorer(null) {
@Override
- public TwoPhaseDocIdSetIterator asTwoPhaseIterator() {
+ public TwoPhaseIterator asTwoPhaseIterator() {
return twoPhaseIterator;
}
@@ -162,7 +162,7 @@ public class TestConjunctionDISI extends
// scorer with approximation
final FixedBitSet confirmed = clearRandomBits(set);
sets[i] = confirmed;
- final TwoPhaseDocIdSetIterator approximation = approximation(new BitDocIdSet(set).iterator(), confirmed);
+ final TwoPhaseIterator approximation = approximation(new BitDocIdSet(set).iterator(), confirmed);
iterators[i] = scorer(approximation);
}
}
@@ -191,17 +191,17 @@ public class TestConjunctionDISI extends
// scorer with approximation
final FixedBitSet confirmed = clearRandomBits(set);
sets[i] = confirmed;
- final TwoPhaseDocIdSetIterator approximation = approximation(new BitDocIdSet(set).iterator(), confirmed);
+ final TwoPhaseIterator approximation = approximation(new BitDocIdSet(set).iterator(), confirmed);
iterators[i] = scorer(approximation);
hasApproximation = true;
}
}
final ConjunctionDISI conjunction = ConjunctionDISI.intersect(Arrays.asList(iterators));
- TwoPhaseDocIdSetIterator twoPhaseIterator = conjunction.asTwoPhaseIterator();
+ TwoPhaseIterator twoPhaseIterator = conjunction.asTwoPhaseIterator();
assertEquals(hasApproximation, twoPhaseIterator != null);
if (hasApproximation) {
- assertEquals(intersect(sets), toBitSet(maxDoc, TwoPhaseDocIdSetIterator.asDocIdSetIterator(twoPhaseIterator)));
+ assertEquals(intersect(sets), toBitSet(maxDoc, TwoPhaseIterator.asDocIdSetIterator(twoPhaseIterator)));
}
}
}
@@ -226,7 +226,7 @@ public class TestConjunctionDISI extends
// scorer with approximation
final FixedBitSet confirmed = clearRandomBits(set);
sets[i] = confirmed;
- final TwoPhaseDocIdSetIterator approximation = approximation(new BitDocIdSet(set).iterator(), confirmed);
+ final TwoPhaseIterator approximation = approximation(new BitDocIdSet(set).iterator(), confirmed);
newIterator = scorer(approximation);
hasApproximation = true;
}
@@ -239,10 +239,10 @@ public class TestConjunctionDISI extends
}
}
- TwoPhaseDocIdSetIterator twoPhaseIterator = ((Scorer) conjunction).asTwoPhaseIterator();
+ TwoPhaseIterator twoPhaseIterator = ((Scorer) conjunction).asTwoPhaseIterator();
assertEquals(hasApproximation, twoPhaseIterator != null);
if (hasApproximation) {
- assertEquals(intersect(sets), toBitSet(maxDoc, TwoPhaseDocIdSetIterator.asDocIdSetIterator(twoPhaseIterator)));
+ assertEquals(intersect(sets), toBitSet(maxDoc, TwoPhaseIterator.asDocIdSetIterator(twoPhaseIterator)));
} else {
assertEquals(intersect(sets), toBitSet(maxDoc, conjunction));
}
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=1662414&r1=1662413&r2=1662414&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 Thu Feb 26 10:52:51 2015
@@ -127,7 +127,7 @@ public class RandomApproximationQuery ex
}
@Override
- public TwoPhaseDocIdSetIterator asTwoPhaseIterator() {
+ public TwoPhaseIterator asTwoPhaseIterator() {
return twoPhaseView;
}
@@ -163,7 +163,7 @@ public class RandomApproximationQuery ex
}
- private static class RandomTwoPhaseView extends TwoPhaseDocIdSetIterator {
+ private static class RandomTwoPhaseView extends TwoPhaseIterator {
private final DocIdSetIterator disi;
private final RandomApproximation approximation;