You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2015/03/25 18:14:01 UTC
svn commit: r1669161 - 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: dsmiley
Date: Wed Mar 25 17:14:00 2015
New Revision: 1669161
URL: http://svn.apache.org/r1669161
Log:
LUCENE-6198: add approximation constructor to TwoPhaseIterator
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperQuery.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/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/DocValuesRewriteMethod.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/FilteredQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.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/SloppyPhraseScorer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.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=1669161&r1=1669160&r2=1669161&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Wed Mar 25 17:14:00 2015
@@ -114,7 +114,7 @@ Optimizations
* 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)
+ (Robert Muir, Adrien Grand, David Smiley)
* LUCENE-6244, LUCENE-6251: All boolean queries but those that have a
minShouldMatch > 1 now either propagate or take advantage of the two-phase
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperQuery.java?rev=1669161&r1=1669160&r2=1669161&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperQuery.java Wed Mar 25 17:14:00 2015
@@ -151,18 +151,14 @@ public class CachingWrapperQuery extends
twoPhaseView = null;
disi = approximation;
} else {
- twoPhaseView = new TwoPhaseIterator() {
+ twoPhaseView = new TwoPhaseIterator(approximation) {
@Override
public boolean matches() throws IOException {
final int doc = approximation.docID();
return acceptDocs.get(doc);
}
-
- @Override
- public DocIdSetIterator approximation() {
- return approximation;
- }
+
};
disi = TwoPhaseIterator.asDocIdSetIterator(twoPhaseView);
}
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=1669161&r1=1669160&r2=1669161&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 Wed Mar 25 17:14:00 2015
@@ -140,18 +140,12 @@ class ConjunctionDISI extends DocIdSetIt
*/
private static class TwoPhaseConjunctionDISI extends TwoPhaseIterator {
- private final ConjunctionDISI approximation;
private final TwoPhaseIterator[] twoPhaseIterators;
private TwoPhaseConjunctionDISI(List<? extends DocIdSetIterator> iterators, List<TwoPhaseIterator> twoPhaseIterators) {
- approximation = new ConjunctionDISI(iterators);
+ super(new ConjunctionDISI(iterators));
assert twoPhaseIterators.size() > 0;
- this.twoPhaseIterators = twoPhaseIterators.toArray(new TwoPhaseIterator[0]);
- }
-
- @Override
- public DocIdSetIterator approximation() {
- return approximation;
+ this.twoPhaseIterators = twoPhaseIterators.toArray(new TwoPhaseIterator[twoPhaseIterators.size()]);
}
@Override
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=1669161&r1=1669160&r2=1669161&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 Wed Mar 25 17:14:00 2015
@@ -119,15 +119,10 @@ abstract class DisjunctionScorer extends
return null;
}
- return new TwoPhaseIterator() {
-
- @Override
- public DocIdSetIterator approximation() {
- // note it is important to share the same pq as this scorer so that
- // rebalancing the pq through the approximation will also rebalance
- // the pq in this scorer.
- return new DisjunctionDISIApproximation(subScorers);
- }
+ // note it is important to share the same pq as this scorer so that
+ // rebalancing the pq through the approximation will also rebalance
+ // the pq in this scorer.
+ return new TwoPhaseIterator(new DisjunctionDISIApproximation(subScorers)) {
@Override
public boolean matches() throws IOException {
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=1669161&r1=1669160&r2=1669161&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 Wed Mar 25 17:14:00 2015
@@ -213,25 +213,19 @@ public final class DocValuesRangeQuery e
private static class TwoPhaseNumericRange extends TwoPhaseIterator {
- private final DocIdSetIterator approximation;
private final SortedNumericDocValues values;
private final long min, max;
private final Bits acceptDocs;
TwoPhaseNumericRange(SortedNumericDocValues values, long min, long max, DocIdSetIterator approximation, Bits acceptDocs) {
+ super(approximation);
this.values = values;
this.min = min;
this.max = max;
- this.approximation = approximation;
this.acceptDocs = acceptDocs;
}
@Override
- public DocIdSetIterator approximation() {
- return approximation;
- }
-
- @Override
public boolean matches() throws IOException {
final int doc = approximation.docID();
if (acceptDocs == null || acceptDocs.get(doc)) {
@@ -251,25 +245,19 @@ public final class DocValuesRangeQuery e
private static class TwoPhaseOrdRange extends TwoPhaseIterator {
- private final DocIdSetIterator approximation;
private final SortedSetDocValues values;
private final long minOrd, maxOrd;
private final Bits acceptDocs;
TwoPhaseOrdRange(SortedSetDocValues values, long minOrd, long maxOrd, DocIdSetIterator approximation, Bits acceptDocs) {
+ super(approximation);
this.values = values;
this.minOrd = minOrd;
this.maxOrd = maxOrd;
- this.approximation = approximation;
this.acceptDocs = acceptDocs;
}
@Override
- public DocIdSetIterator approximation() {
- return approximation;
- }
-
- @Override
public boolean matches() throws IOException {
final int doc = approximation.docID();
if (acceptDocs == null || acceptDocs.get(doc)) {
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java?rev=1669161&r1=1669160&r2=1669161&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java Wed Mar 25 17:14:00 2015
@@ -150,11 +150,7 @@ public final class DocValuesRewriteMetho
} while (termsEnum.next() != null);
final DocIdSetIterator approximation = DocIdSetIterator.all(context.reader().maxDoc());
- final TwoPhaseIterator twoPhaseIterator = new TwoPhaseIterator() {
- @Override
- public DocIdSetIterator approximation() {
- return approximation;
- }
+ final TwoPhaseIterator twoPhaseIterator = new TwoPhaseIterator(approximation) {
@Override
public boolean matches() throws IOException {
final int doc = approximation.docID();
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=1669161&r1=1669160&r2=1669161&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 Wed Mar 25 17:14:00 2015
@@ -160,11 +160,7 @@ public class DocValuesTermsQuery extends
}
final DocIdSetIterator approximation = DocIdSetIterator.all(context.reader().maxDoc());
- final TwoPhaseIterator twoPhaseIterator = new TwoPhaseIterator() {
- @Override
- public DocIdSetIterator approximation() {
- return approximation;
- }
+ final TwoPhaseIterator twoPhaseIterator = new TwoPhaseIterator(approximation) {
@Override
public boolean matches() throws IOException {
final int doc = approximation.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=1669161&r1=1669160&r2=1669161&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 Wed Mar 25 17:14:00 2015
@@ -63,17 +63,11 @@ final class ExactPhraseScorer extends Sc
@Override
public TwoPhaseIterator asTwoPhaseIterator() {
- return new TwoPhaseIterator() {
-
+ return new TwoPhaseIterator(conjunction) {
@Override
public boolean matches() throws IOException {
return phraseFreq() > 0;
}
-
- @Override
- public DocIdSetIterator approximation() {
- return conjunction;
- }
};
}
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=1669161&r1=1669160&r2=1669161&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 Wed Mar 25 17:14:00 2015
@@ -71,7 +71,7 @@ public final class FieldValueQuery exten
}
final DocIdSetIterator approximation = DocIdSetIterator.all(context.reader().maxDoc());
- final TwoPhaseIterator twoPhaseIterator = new TwoPhaseIterator() {
+ final TwoPhaseIterator twoPhaseIterator = new TwoPhaseIterator(approximation) {
@Override
public boolean matches() throws IOException {
@@ -85,10 +85,6 @@ public final class FieldValueQuery exten
return true;
}
- @Override
- public DocIdSetIterator approximation() {
- return approximation;
- }
};
final DocIdSetIterator disi = TwoPhaseIterator.asDocIdSetIterator(twoPhaseIterator);
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java?rev=1669161&r1=1669160&r2=1669161&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java Wed Mar 25 17:14:00 2015
@@ -216,11 +216,7 @@ public class FilteredQuery extends Query
TwoPhaseIterator inner = scorer.asTwoPhaseIterator();
if (inner != null) {
// we are like a simplified conjunction here, handle the nested case:
- return new TwoPhaseIterator() {
- @Override
- public DocIdSetIterator approximation() {
- return inner.approximation();
- }
+ return new TwoPhaseIterator(inner.approximation()) {
@Override
public boolean matches() throws IOException {
// check the approximation matches first, then check bits last.
@@ -229,12 +225,7 @@ public class FilteredQuery extends Query
};
} else {
// scorer doesnt have an approximation, just use it, to force bits applied last.
- return new TwoPhaseIterator() {
- @Override
- public DocIdSetIterator approximation() {
- return scorer;
- }
-
+ return new TwoPhaseIterator(scorer) {
@Override
public boolean matches() throws IOException {
return filterBits.get(scorer.docID());
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java?rev=1669161&r1=1669160&r2=1669161&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java Wed Mar 25 17:14:00 2015
@@ -570,18 +570,12 @@ public class LRUQueryCache implements Qu
twoPhaseView = null;
disi = approximation;
} else {
- twoPhaseView = new TwoPhaseIterator() {
-
+ twoPhaseView = new TwoPhaseIterator(approximation) {
@Override
public boolean matches() throws IOException {
final int doc = approximation.docID();
return acceptDocs.get(doc);
}
-
- @Override
- public DocIdSetIterator approximation() {
- return approximation;
- }
};
disi = TwoPhaseIterator.asDocIdSetIterator(twoPhaseView);
}
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=1669161&r1=1669160&r2=1669161&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 Wed Mar 25 17:14:00 2015
@@ -136,12 +136,7 @@ class ReqExclScorer extends Scorer {
if (reqTwoPhaseIterator == null) {
return null;
}
- return new TwoPhaseIterator() {
-
- @Override
- public DocIdSetIterator approximation() {
- return reqApproximation;
- }
+ return new TwoPhaseIterator(reqApproximation) {
@Override
public boolean matches() throws IOException {
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=1669161&r1=1669160&r2=1669161&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 Wed Mar 25 17:14:00 2015
@@ -590,12 +590,7 @@ final class SloppyPhraseScorer extends S
@Override
public TwoPhaseIterator asTwoPhaseIterator() {
- return new TwoPhaseIterator() {
- @Override
- public DocIdSetIterator approximation() {
- return conjunction;
- }
-
+ return new TwoPhaseIterator(conjunction) {
@Override
public boolean matches() throws IOException {
sloppyFreq = phraseFreq(); // check for phrase
Modified: 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=1669161&r1=1669160&r2=1669161&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.java Wed Mar 25 17:14:00 2015
@@ -18,9 +18,11 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
+import java.util.Objects;
/**
- * An approximation of a {@link DocIdSetIterator}. When the {@link #approximation()}'s
+ * Returned by {@link Scorer#asTwoPhaseIterator()} to expose 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.
@@ -28,6 +30,13 @@ import java.io.IOException;
*/
public abstract class TwoPhaseIterator {
+ protected final DocIdSetIterator approximation;
+
+ /** Takes the approximation to be returned by {@link #approximation}. Not null. */
+ protected TwoPhaseIterator(DocIdSetIterator approximation) {
+ this.approximation = Objects.requireNonNull(approximation);
+ }
+
/** Return a {@link DocIdSetIterator} view of the provided
* {@link TwoPhaseIterator}. */
public static DocIdSetIterator asDocIdSetIterator(TwoPhaseIterator twoPhaseIterator) {
@@ -70,7 +79,9 @@ public abstract class TwoPhaseIterator {
/** 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();
+ public DocIdSetIterator approximation() {
+ return 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
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=1669161&r1=1669160&r2=1669161&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 Wed Mar 25 17:14:00 2015
@@ -28,12 +28,7 @@ import org.apache.lucene.util.TestUtil;
public class TestConjunctionDISI extends LuceneTestCase {
private static TwoPhaseIterator approximation(final DocIdSetIterator iterator, final FixedBitSet confirmed) {
- return new TwoPhaseIterator() {
-
- @Override
- public DocIdSetIterator approximation() {
- return iterator;
- }
+ return new TwoPhaseIterator(iterator) {
@Override
public boolean matches() throws IOException {
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=1669161&r1=1669160&r2=1669161&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 Wed Mar 25 17:14:00 2015
@@ -166,26 +166,20 @@ public class RandomApproximationQuery ex
private static class RandomTwoPhaseView extends TwoPhaseIterator {
private final DocIdSetIterator disi;
- private final RandomApproximation approximation;
private int lastDoc = -1;
RandomTwoPhaseView(Random random, DocIdSetIterator disi) {
+ super(new RandomApproximation(random, disi));
this.disi = disi;
- this.approximation = new RandomApproximation(random, disi);
- }
-
- @Override
- public DocIdSetIterator approximation() {
- return approximation;
}
@Override
public boolean matches() throws IOException {
if (approximation.docID() == -1 || approximation.docID() == DocIdSetIterator.NO_MORE_DOCS) {
- throw new AssertionError("matches() should not be called on doc ID " + approximation.doc);
+ throw new AssertionError("matches() should not be called on doc ID " + approximation.docID());
}
if (lastDoc == approximation.docID()) {
- throw new AssertionError("matches() has been called twice on doc ID " + approximation.doc);
+ throw new AssertionError("matches() has been called twice on doc ID " + approximation.docID());
}
lastDoc = approximation.docID();
return approximation.docID() == disi.docID();