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/10/22 13:30:52 UTC
svn commit: r1709993 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/core/ 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/core/src/test/or...
Author: romseygeek
Date: Thu Oct 22 11:30:51 2015
New Revision: 1709993
URL: http://svn.apache.org/viewvc?rev=1709993&view=rev
Log:
LUCENE-6845: Merge SpanScorer into Spans
Added:
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/ScoringWrapperSpans.java
- copied unchanged from r1709964, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/ScoringWrapperSpans.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java
- copied, changed from r1709964, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java
Removed:
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/NearSpans.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocIdSetIterator.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/ConjunctionSpans.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/ContainSpans.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/FilterSpans.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanContainingQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanWithinQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestFilterSpans.java
lucene/dev/branches/branch_5x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_5x/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
lucene/dev/branches/branch_5x/lucene/queries/ (props changed)
lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadFunction.java
lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadNearQuery.java
lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadScoreQuery.java
lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadTermQuery.java
lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/SpanPayloadCheckQuery.java
lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java
lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java
lucene/dev/branches/branch_5x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/payloads/PayloadSpanUtil.java
lucene/dev/branches/branch_5x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpanWeight.java
lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpans.java
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Thu Oct 22 11:30:51 2015
@@ -203,6 +203,8 @@ Other
* LUCENE-6467: Simplify Query.equals. (Paul Elschot via Adrien Grand)
+* LUCENE-6845: SpanScorer is now merged into Spans (Alan Woodward, David Smiley)
+
Build
* LUCENE-6732: Improve checker for invalid source patterns to also
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocIdSetIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocIdSetIterator.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocIdSetIterator.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocIdSetIterator.java Thu Oct 22 11:30:51 2015
@@ -19,8 +19,6 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.search.spans.Spans;
-
/**
* This abstract class defines methods to iterate over a set of non-decreasing
* doc ids. Note that this class assumes it iterates on doc Ids, and therefore
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.java Thu Oct 22 11:30:51 2015
@@ -20,11 +20,8 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.Objects;
-import org.apache.lucene.search.spans.Spans;
-
/**
* Returned by {@link Scorer#asTwoPhaseIterator()}
- * and {@link Spans#asTwoPhaseIterator()}
* to expose an approximation of a {@link DocIdSetIterator}.
* When the {@link #approximation()}'s
* {@link DocIdSetIterator#nextDoc()} or {@link DocIdSetIterator#advance(int)}
@@ -100,8 +97,6 @@ public abstract class TwoPhaseIterator {
public static TwoPhaseIterator asTwoPhaseIterator(DocIdSetIterator iter) {
return (iter instanceof Scorer)
? ((Scorer) iter).asTwoPhaseIterator()
- : (iter instanceof Spans)
- ? ((Spans) iter).asTwoPhaseIterator()
: null;
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/ConjunctionSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/ConjunctionSpans.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/ConjunctionSpans.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/ConjunctionSpans.java Thu Oct 22 11:30:51 2015
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.ConjunctionDISI;
import org.apache.lucene.search.TwoPhaseIterator;
+import org.apache.lucene.search.similarities.Similarity;
/**
* Common super class for multiple sub spans required in a document.
@@ -33,7 +34,8 @@ abstract class ConjunctionSpans extends
boolean atFirstInCurrentDoc; // a first start position is available in current doc for nextStartPosition
boolean oneExhaustedInCurrentDoc; // one subspans exhausted in current doc
- ConjunctionSpans(List<Spans> subSpans) {
+ ConjunctionSpans(List<Spans> subSpans, SpanWeight weight, Similarity.SimScorer docScorer) {
+ super(weight, docScorer);
if (subSpans.size() < 2) {
throw new IllegalArgumentException("Less than 2 subSpans.size():" + subSpans.size());
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/ContainSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/ContainSpans.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/ContainSpans.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/ContainSpans.java Thu Oct 22 11:30:51 2015
@@ -21,13 +21,15 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Objects;
+import org.apache.lucene.search.similarities.Similarity;
+
abstract class ContainSpans extends ConjunctionSpans {
Spans sourceSpans;
Spans bigSpans;
Spans littleSpans;
- ContainSpans(Spans bigSpans, Spans littleSpans, Spans sourceSpans) {
- super(Arrays.asList(bigSpans, littleSpans));
+ ContainSpans(SpanWeight weight, Similarity.SimScorer simScorer, Spans bigSpans, Spans littleSpans, Spans sourceSpans) {
+ super(Arrays.asList(bigSpans, littleSpans), weight, simScorer);
this.bigSpans = Objects.requireNonNull(bigSpans);
this.littleSpans = Objects.requireNonNull(littleSpans);
this.sourceSpans = Objects.requireNonNull(sourceSpans);
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/FilterSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/FilterSpans.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/FilterSpans.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/FilterSpans.java Thu Oct 22 11:30:51 2015
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.util.Objects;
import org.apache.lucene.search.TwoPhaseIterator;
+import org.apache.lucene.search.similarities.Similarity;
/**
* A {@link Spans} implementation wrapping another spans instance,
@@ -35,7 +36,8 @@ public abstract class FilterSpans extend
private int startPos = -1;
/** Wrap the given {@link Spans}. */
- protected FilterSpans(Spans in) {
+ protected FilterSpans(Spans in, Similarity.SimScorer docScorer) {
+ super((SpanWeight)in.getWeight(), docScorer);
this.in = Objects.requireNonNull(in);
}
@@ -181,7 +183,7 @@ public abstract class FilterSpans extend
}
}
}
-
+
/**
* Status returned from {@link FilterSpans#accept(Spans)} that indicates
* whether a candidate match should be accepted, rejected, or rejected
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java Thu Oct 22 11:30:51 2015
@@ -20,6 +20,8 @@ package org.apache.lucene.search.spans;
import java.io.IOException;
import java.util.List;
+import org.apache.lucene.search.similarities.Similarity;
+
/**
* A Spans that is formed from the ordered subspans of a SpanNearQuery
* where the subspans do not overlap and have a maximum slop between them.
@@ -42,15 +44,18 @@ import java.util.List;
* Expert:
* Only public for subclassing. Most implementations should not need this class
*/
-public class NearSpansOrdered extends NearSpans {
+public class NearSpansOrdered extends ConjunctionSpans {
protected int matchStart = -1;
protected int matchEnd = -1;
protected int matchWidth = -1;
- public NearSpansOrdered(SpanNearQuery query, List<Spans> subSpans) throws IOException {
- super(query, subSpans);
+ private final int allowedSlop;
+
+ public NearSpansOrdered(SpanWeight weight, int allowedSlop, List<Spans> subSpans, Similarity.SimScorer simScorer) throws IOException {
+ super(subSpans, weight, simScorer);
this.atFirstInCurrentDoc = true; // -1 startPosition/endPosition also at doc -1
+ this.allowedSlop = allowedSlop;
}
@Override
@@ -149,7 +154,7 @@ public class NearSpansOrdered extends Ne
@Override
public String toString() {
- return "NearSpansOrdered("+query.toString()+")@"+docID()+": "+startPosition()+" - "+endPosition();
+ return "NearSpansOrdered("+weight.getQuery().toString()+")@"+docID()+": "+startPosition()+" - "+endPosition();
}
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java Thu Oct 22 11:30:51 2015
@@ -17,28 +17,30 @@ package org.apache.lucene.search.spans;
* limitations under the License.
*/
-import org.apache.lucene.search.TwoPhaseIterator;
-import org.apache.lucene.util.PriorityQueue;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import org.apache.lucene.search.TwoPhaseIterator;
+import org.apache.lucene.search.similarities.Similarity;
+import org.apache.lucene.util.PriorityQueue;
+
/**
* Similar to {@link NearSpansOrdered}, but for the unordered case.
*
* Expert:
* Only public for subclassing. Most implementations should not need this class
*/
-public class NearSpansUnordered extends NearSpans {
+public class NearSpansUnordered extends ConjunctionSpans {
private List<SpansCell> subSpanCells; // in query order
+ private final int allowedSlop;
private SpanPositionQueue spanPositionQueue;
- public NearSpansUnordered(SpanNearQuery query, List<Spans> subSpans)
+ public NearSpansUnordered(SpanWeight weight, int allowedSlop, List<Spans> subSpans, Similarity.SimScorer simScorer)
throws IOException {
- super(query, subSpans);
+ super(subSpans, weight, simScorer);
this.subSpanCells = new ArrayList<>(subSpans.size());
for (Spans subSpan : subSpans) { // sub spans in query order
@@ -46,6 +48,7 @@ public class NearSpansUnordered extends
}
spanPositionQueue = new SpanPositionQueue(subSpans.size());
singleCellToPositionQueue(); // -1 startPosition/endPosition also at doc -1
+ this.allowedSlop = allowedSlop;
}
private void singleCellToPositionQueue() {
@@ -74,6 +77,7 @@ public class NearSpansUnordered extends
final Spans in;
public SpansCell(Spans spans) {
+ super((SpanWeight) NearSpansUnordered.this.weight, NearSpansUnordered.this.docScorer);
this.in = spans;
}
@@ -172,7 +176,7 @@ public class NearSpansUnordered extends
* or the spans start at the same position,
* and spans1 ends before spans2.
*/
- static final boolean positionsOrdered(Spans spans1, Spans spans2) {
+ static boolean positionsOrdered(Spans spans1, Spans spans2) {
assert spans1.docID() == spans2.docID() : "doc1 " + spans1.docID() + " != doc2 " + spans2.docID();
int start1 = spans1.startPosition();
int start2 = spans2.startPosition();
@@ -261,10 +265,10 @@ public class NearSpansUnordered extends
@Override
public String toString() {
if (minPositionCell() != null) {
- return getClass().getName() + "("+query.toString()+")@"+
+ return getClass().getName() + "("+weight.getQuery().toString()+")@"+
(docID()+":"+startPosition()+"-"+endPosition());
} else {
- return getClass().getName() + "("+query.toString()+")@ ?START?";
+ return getClass().getName() + "("+weight.getQuery().toString()+")@ ?START?";
}
}
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanContainingQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanContainingQuery.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanContainingQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanContainingQuery.java Thu Oct 22 11:30:51 2015
@@ -71,7 +71,7 @@ public final class SpanContainingQuery e
Spans big = containerContained.get(0);
Spans little = containerContained.get(1);
- return new ContainSpans(big, little, big) {
+ return new ContainSpans(this, getSimScorer(context), big, little, big) {
@Override
boolean twoPhaseCurrentDocMatches() throws IOException {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java Thu Oct 22 11:30:51 2015
@@ -229,8 +229,8 @@ public class SpanNearQuery extends SpanQ
}
// all NearSpans require at least two subSpans
- return (!inOrder) ? new NearSpansUnordered(SpanNearQuery.this, subSpans)
- : new NearSpansOrdered(SpanNearQuery.this, subSpans);
+ return (!inOrder) ? new NearSpansUnordered(this, slop, subSpans, getSimScorer(context))
+ : new NearSpansOrdered(this, slop, subSpans, getSimScorer(context));
}
@Override
@@ -339,6 +339,7 @@ public class SpanNearQuery extends SpanQ
final int width;
GapSpans(int width) {
+ super(null, null);
this.width = width;
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java Thu Oct 22 11:30:51 2015
@@ -129,13 +129,13 @@ public final class SpanNotQuery extends
final Spans excludeSpans = excludeWeight.getSpans(context, requiredPostings);
if (excludeSpans == null) {
- return includeSpans;
+ return new ScoringWrapperSpans(includeSpans, getSimScorer(context));
}
final TwoPhaseIterator excludeTwoPhase = excludeSpans.asTwoPhaseIterator();
final DocIdSetIterator excludeApproximation = excludeTwoPhase == null ? null : excludeTwoPhase.approximation();
- return new FilterSpans(includeSpans) {
+ return new FilterSpans(includeSpans, getSimScorer(context)) {
// last document we have checked matches() against for the exclusion, and failed
// when using approximations, so we don't call it again, and pass thru all inclusions.
int lastApproxDoc = -1;
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java Thu Oct 22 11:30:51 2015
@@ -172,7 +172,7 @@ public final class SpanOrQuery extends S
if (subSpans.size() == 0) {
return null;
} else if (subSpans.size() == 1) {
- return subSpans.get(0);
+ return new ScoringWrapperSpans(subSpans.get(0), getSimScorer(context));
}
final DisiPriorityQueue<Spans> byDocQueue = new DisiPriorityQueue<>(subSpans.size());
@@ -182,7 +182,7 @@ public final class SpanOrQuery extends S
final SpanPositionQueue byPositionQueue = new SpanPositionQueue(subSpans.size()); // when empty use -1
- return new Spans() {
+ return new Spans(this, getSimScorer(context)) {
Spans topPositionSpans = null;
@Override
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java Thu Oct 22 11:30:51 2015
@@ -95,7 +95,7 @@ public abstract class SpanPositionCheckQ
@Override
public Spans getSpans(final LeafReaderContext context, Postings requiredPostings) throws IOException {
Spans matchSpans = matchWeight.getSpans(context, requiredPostings);
- return (matchSpans == null) ? null : new FilterSpans(matchSpans) {
+ return (matchSpans == null) ? null : new FilterSpans(matchSpans, getSimScorer(context)) {
@Override
protected AcceptStatus accept(Spans candidate) throws IOException {
return acceptPosition(candidate);
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java Thu Oct 22 11:30:51 2015
@@ -118,7 +118,7 @@ public class SpanTermQuery extends SpanQ
termsEnum.seekExact(term.bytes(), state);
final PostingsEnum postings = termsEnum.postings(null, requiredPostings.getRequiredPostings());
- return new TermSpans(postings, term);
+ return new TermSpans(this, getSimScorer(context), postings, term);
}
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java Thu Oct 22 11:30:51 2015
@@ -24,7 +24,6 @@ import org.apache.lucene.index.LeafReade
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermContext;
-import org.apache.lucene.index.Terms;
import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.IndexSearcher;
@@ -133,26 +132,22 @@ public abstract class SpanWeight extends
@Override
public Scorer scorer(LeafReaderContext context) throws IOException {
- if (field == null) {
- return null;
- }
- Terms terms = context.reader().terms(field);
- if (terms != null && terms.hasPositions() == false) {
- throw new IllegalStateException("field \"" + field + "\" was indexed without position data; cannot run SpanQuery (query=" + parentQuery + ")");
- }
-
- Spans spans = getSpans(context, Postings.POSITIONS);
- Similarity.SimScorer simScorer = getSimScorer(context);
- return (spans == null) ? null : new SpanScorer(spans, this, simScorer);
+ return getSpans(context, Postings.POSITIONS);
}
+ /**
+ * Return a SimScorer for this context
+ * @param context the LeafReaderContext
+ * @return a SimWeight
+ * @throws IOException on error
+ */
public Similarity.SimScorer getSimScorer(LeafReaderContext context) throws IOException {
return simWeight == null ? null : similarity.simScorer(simWeight, context);
}
@Override
public Explanation explain(LeafReaderContext context, int doc) throws IOException {
- SpanScorer scorer = (SpanScorer) scorer(context);
+ Spans scorer = (Spans) scorer(context);
if (scorer != null) {
int newDoc = scorer.advance(doc);
if (newDoc == doc) {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanWithinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanWithinQuery.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanWithinQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanWithinQuery.java Thu Oct 22 11:30:51 2015
@@ -72,7 +72,7 @@ public final class SpanWithinQuery exten
Spans big = containerContained.get(0);
Spans little = containerContained.get(1);
- return new ContainSpans(big, little, little) {
+ return new ContainSpans(this, getSimScorer(context), big, little, little) {
@Override
boolean twoPhaseCurrentDocMatches() throws IOException {
Copied: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java (from r1709964, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java?p2=lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java&p1=lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java&r1=1709964&r2=1709993&rev=1709993&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java Thu Oct 22 11:30:51 2015
@@ -183,7 +183,7 @@ public abstract class Spans extends Scor
/** Returns the intermediate "sloppy freq" adjusted for edit distance
* @lucene.internal */
- final float sloppyFreq() throws IOException {
+ public final float sloppyFreq() throws IOException {
ensureFreq();
return freq;
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java Thu Oct 22 11:30:51 2015
@@ -16,12 +16,13 @@ package org.apache.lucene.search.spans;
*/
+import java.io.IOException;
+import java.util.Objects;
+
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.DocIdSetIterator;
-
-import java.io.IOException;
-import java.util.Objects;
+import org.apache.lucene.search.similarities.Similarity;
/**
* Expert:
@@ -37,7 +38,8 @@ public class TermSpans extends Spans {
protected int position;
protected boolean readPayload;
- public TermSpans(PostingsEnum postings, Term term) {
+ public TermSpans(SpanWeight weight, Similarity.SimScorer scorer, PostingsEnum postings, Term term) {
+ super(weight, scorer);
this.postings = Objects.requireNonNull(postings);
this.term = Objects.requireNonNull(term);
this.doc = -1;
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java Thu Oct 22 11:30:51 2015
@@ -42,9 +42,9 @@ import org.apache.lucene.search.spans.Mu
import org.apache.lucene.search.spans.SpanCollector;
import org.apache.lucene.search.spans.SpanNearQuery;
import org.apache.lucene.search.spans.SpanQuery;
+import org.apache.lucene.search.spans.Spans;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.search.spans.SpanWeight;
-import org.apache.lucene.search.spans.Spans;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java Thu Oct 22 11:30:51 2015
@@ -20,7 +20,6 @@ package org.apache.lucene.search.spans;
import java.io.IOException;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.similarities.Similarity;
/**
* Holds all implementations of classes in the o.a.l.s.spans package as a
@@ -35,6 +34,10 @@ final class JustCompileSearchSpans {
static final class JustCompileSpans extends Spans {
+ JustCompileSpans() {
+ super(null, null);
+ }
+
@Override
public int docID() {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
@@ -100,65 +103,4 @@ final class JustCompileSearchSpans {
}
- static final class JustCompilePayloadSpans extends Spans {
-
- @Override
- public int docID() {
- throw new UnsupportedOperationException(UNSUPPORTED_MSG);
- }
-
- @Override
- public int nextDoc() throws IOException {
- throw new UnsupportedOperationException(UNSUPPORTED_MSG);
- }
-
- @Override
- public int advance(int target) throws IOException {
- throw new UnsupportedOperationException(UNSUPPORTED_MSG);
- }
-
- @Override
- public int startPosition() {
- throw new UnsupportedOperationException(UNSUPPORTED_MSG);
- }
-
- @Override
- public int endPosition() {
- throw new UnsupportedOperationException(UNSUPPORTED_MSG);
- }
-
- @Override
- public int width() {
- throw new UnsupportedOperationException(UNSUPPORTED_MSG);
- }
-
- @Override
- public void collect(SpanCollector collector) throws IOException {
-
- }
-
- @Override
- public int nextStartPosition() throws IOException {
- throw new UnsupportedOperationException(UNSUPPORTED_MSG);
- }
-
- @Override
- public long cost() {
- throw new UnsupportedOperationException(UNSUPPORTED_MSG);
- }
-
- }
-
- static final class JustCompileSpanScorer extends SpanScorer {
-
- protected JustCompileSpanScorer(Spans spans, SpanWeight weight,
- Similarity.SimScorer docScorer) throws IOException {
- super(spans, weight, docScorer);
- }
-
- @Override
- protected float scoreCurrentDoc() throws IOException {
- throw new UnsupportedOperationException(UNSUPPORTED_MSG);
- }
- }
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestFilterSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestFilterSpans.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestFilterSpans.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestFilterSpans.java Thu Oct 22 11:30:51 2015
@@ -31,6 +31,9 @@ public class TestFilterSpans extends Luc
// verify that all methods of Spans are overridden by FilterSpans,
// except those under the 'exclude' list
Set<Method> exclude = new HashSet<>();
+ exclude.add(FilterSpans.class.getMethod("freq"));
+ exclude.add(FilterSpans.class.getMethod("score"));
+ exclude.add(FilterSpans.class.getMethod("sloppyFreq"));
for (Method m : FilterSpans.class.getMethods()) {
if (m.getDeclaringClass() == Spans.class) {
assertTrue("method " + m.getName() + " not overridden!", exclude.contains(m));
Modified: lucene/dev/branches/branch_5x/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java (original)
+++ lucene/dev/branches/branch_5x/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java Thu Oct 22 11:30:51 2015
@@ -64,9 +64,9 @@ import org.apache.lucene.search.spans.Sp
import org.apache.lucene.search.spans.SpanNotQuery;
import org.apache.lucene.search.spans.SpanOrQuery;
import org.apache.lucene.search.spans.SpanQuery;
+import org.apache.lucene.search.spans.Spans;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.search.spans.SpanWeight;
-import org.apache.lucene.search.spans.Spans;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.IOUtils;
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadFunction.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadFunction.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadFunction.java Thu Oct 22 11:30:51 2015
@@ -17,6 +17,7 @@ package org.apache.lucene.queries.payloa
*/
import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.spans.Spans;
/**
* An abstract class that defines a way for PayloadScoreQuery instances to transform
@@ -41,7 +42,7 @@ public abstract class PayloadFunction {
* @param currentPayloadScore The score for the current payload
* @return The new current Score
*
- * @see org.apache.lucene.search.spans.Spans
+ * @see Spans
*/
public abstract float currentScore(int docId, String field, int start, int end, int numPayloadsSeen, float currentScore, float currentPayloadScore);
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadNearQuery.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadNearQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadNearQuery.java Thu Oct 22 11:30:51 2015
@@ -38,7 +38,6 @@ import org.apache.lucene.search.similari
import org.apache.lucene.search.spans.SpanCollector;
import org.apache.lucene.search.spans.SpanNearQuery;
import org.apache.lucene.search.spans.SpanQuery;
-import org.apache.lucene.search.spans.SpanScorer;
import org.apache.lucene.search.spans.SpanWeight;
import org.apache.lucene.search.spans.Spans;
import org.apache.lucene.util.BytesRef;
@@ -183,7 +182,7 @@ public class PayloadNearQuery extends Sp
}
}
- public class PayloadNearSpanScorer extends SpanScorer implements SpanCollector {
+ public class PayloadNearSpanScorer extends Spans implements SpanCollector {
Spans spans;
protected float payloadScore;
@@ -191,7 +190,7 @@ public class PayloadNearQuery extends Sp
private final List<byte[]> payloads = new ArrayList<>();
protected PayloadNearSpanScorer(Spans spans, SpanWeight weight, Similarity.SimScorer docScorer) throws IOException {
- super(spans, weight, docScorer);
+ super(weight, docScorer);
this.spans = spans;
}
@@ -221,6 +220,31 @@ public class PayloadNearQuery extends Sp
}
@Override
+ public int nextStartPosition() throws IOException {
+ return spans.nextStartPosition();
+ }
+
+ @Override
+ public int startPosition() {
+ return spans.startPosition();
+ }
+
+ @Override
+ public int endPosition() {
+ return spans.endPosition();
+ }
+
+ @Override
+ public int width() {
+ return spans.width();
+ }
+
+ @Override
+ public void collect(SpanCollector collector) throws IOException {
+ spans.collect(collector);
+ }
+
+ @Override
protected void doStartCurrentDoc() throws IOException {
payloadScore = 0;
payloadsSeen = 0;
@@ -253,6 +277,26 @@ public class PayloadNearQuery extends Sp
public void reset() {
this.payloads.clear();
}
+
+ @Override
+ public int docID() {
+ return spans.docID();
+ }
+
+ @Override
+ public int nextDoc() throws IOException {
+ return spans.nextDoc();
+ }
+
+ @Override
+ public int advance(int target) throws IOException {
+ return spans.advance(target);
+ }
+
+ @Override
+ public long cost() {
+ return spans.cost();
+ }
}
}
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadScoreQuery.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadScoreQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadScoreQuery.java Thu Oct 22 11:30:51 2015
@@ -32,7 +32,6 @@ import org.apache.lucene.search.similari
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.spans.SpanCollector;
import org.apache.lucene.search.spans.SpanQuery;
-import org.apache.lucene.search.spans.SpanScorer;
import org.apache.lucene.search.spans.SpanWeight;
import org.apache.lucene.search.spans.Spans;
import org.apache.lucene.util.BytesRef;
@@ -137,7 +136,7 @@ public class PayloadScoreQuery extends S
Spans spans = getSpans(context, Postings.PAYLOADS);
if (spans == null)
return null;
- return new PayloadSpanScorer(spans, this, innerWeight.getSimScorer(context));
+ return new PayloadSpans(spans, this, innerWeight.getSimScorer(context));
}
@Override
@@ -157,7 +156,7 @@ public class PayloadScoreQuery extends S
@Override
public Explanation explain(LeafReaderContext context, int doc) throws IOException {
- PayloadSpanScorer scorer = (PayloadSpanScorer) scorer(context);
+ PayloadSpans scorer = (PayloadSpans) scorer(context);
if (scorer == null || scorer.advance(doc) != doc)
return Explanation.noMatch("No match");
@@ -174,13 +173,40 @@ public class PayloadScoreQuery extends S
}
}
- private class PayloadSpanScorer extends SpanScorer implements SpanCollector {
+ private class PayloadSpans extends Spans implements SpanCollector {
private int payloadsSeen;
private float payloadScore;
+ private final Spans in;
- private PayloadSpanScorer(Spans spans, SpanWeight weight, Similarity.SimScorer docScorer) throws IOException {
- super(spans, weight, docScorer);
+ private PayloadSpans(Spans spans, SpanWeight weight, Similarity.SimScorer docScorer) throws IOException {
+ super(weight, docScorer);
+ this.in = spans;
+ }
+
+ @Override
+ public int nextStartPosition() throws IOException {
+ return in.nextStartPosition();
+ }
+
+ @Override
+ public int startPosition() {
+ return in.startPosition();
+ }
+
+ @Override
+ public int endPosition() {
+ return in.endPosition();
+ }
+
+ @Override
+ public int width() {
+ return in.width();
+ }
+
+ @Override
+ public void collect(SpanCollector collector) throws IOException {
+ in.collect(collector);
}
@Override
@@ -191,7 +217,7 @@ public class PayloadScoreQuery extends S
@Override
protected void doCurrentSpans() throws IOException {
- spans.collect(this);
+ in.collect(this);
}
@Override
@@ -199,8 +225,8 @@ public class PayloadScoreQuery extends S
BytesRef payload = postings.getPayload();
if (payload == null)
return;
- float payloadFactor = docScorer.computePayloadFactor(docID(), spans.startPosition(), spans.endPosition(), payload);
- payloadScore = function.currentScore(docID(), getField(), spans.startPosition(), spans.endPosition(),
+ float payloadFactor = docScorer.computePayloadFactor(docID(), in.startPosition(), in.endPosition(), payload);
+ payloadScore = function.currentScore(docID(), getField(), in.startPosition(), in.endPosition(),
payloadsSeen, payloadScore, payloadFactor);
payloadsSeen++;
}
@@ -228,6 +254,26 @@ public class PayloadScoreQuery extends S
public void reset() {
}
+
+ @Override
+ public int docID() {
+ return in.docID();
+ }
+
+ @Override
+ public int nextDoc() throws IOException {
+ return in.nextDoc();
+ }
+
+ @Override
+ public int advance(int target) throws IOException {
+ return in.advance(target);
+ }
+
+ @Override
+ public long cost() {
+ return in.cost();
+ }
}
}
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadTermQuery.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadTermQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadTermQuery.java Thu Oct 22 11:30:51 2015
@@ -33,7 +33,6 @@ import org.apache.lucene.search.similari
import org.apache.lucene.search.similarities.Similarity.SimScorer;
import org.apache.lucene.search.spans.SpanCollector;
import org.apache.lucene.search.spans.SpanQuery;
-import org.apache.lucene.search.spans.SpanScorer;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.search.spans.SpanWeight;
import org.apache.lucene.search.spans.Spans;
@@ -108,14 +107,41 @@ public class PayloadTermQuery extends Sp
: new PayloadTermSpanScorer(spans, this, simScorer);
}
- protected class PayloadTermSpanScorer extends SpanScorer {
+ protected class PayloadTermSpanScorer extends Spans {
protected BytesRef payload;
protected float payloadScore;
protected int payloadsSeen;
+ private final Spans spans;
private final PayloadTermCollector payloadCollector = new PayloadTermCollector();
public PayloadTermSpanScorer(Spans spans, SpanWeight weight, Similarity.SimScorer docScorer) throws IOException {
- super(spans, weight, docScorer);
+ super(weight, docScorer);
+ this.spans = spans;
+ }
+
+ @Override
+ public int nextStartPosition() throws IOException {
+ return spans.nextStartPosition();
+ }
+
+ @Override
+ public int startPosition() {
+ return spans.startPosition();
+ }
+
+ @Override
+ public int endPosition() {
+ return spans.endPosition();
+ }
+
+ @Override
+ public int width() {
+ return spans.width();
+ }
+
+ @Override
+ public void collect(SpanCollector collector) throws IOException {
+ spans.collect(collector);
}
@Override
@@ -173,6 +199,26 @@ public class PayloadTermQuery extends Sp
protected float getPayloadScore() {
return function.docScore(docID(), term.field(), payloadsSeen, payloadScore);
}
+
+ @Override
+ public int docID() {
+ return spans.docID();
+ }
+
+ @Override
+ public int nextDoc() throws IOException {
+ return spans.nextDoc();
+ }
+
+ @Override
+ public int advance(int target) throws IOException {
+ return spans.advance(target);
+ }
+
+ @Override
+ public long cost() {
+ return spans.cost();
+ }
}
@Override
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/SpanPayloadCheckQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/SpanPayloadCheckQuery.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/SpanPayloadCheckQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/SpanPayloadCheckQuery.java Thu Oct 22 11:30:51 2015
@@ -28,12 +28,10 @@ import org.apache.lucene.index.TermConte
import org.apache.lucene.index.Terms;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.spans.FilterSpans;
import org.apache.lucene.search.spans.FilterSpans.AcceptStatus;
import org.apache.lucene.search.spans.SpanCollector;
import org.apache.lucene.search.spans.SpanQuery;
-import org.apache.lucene.search.spans.SpanScorer;
import org.apache.lucene.search.spans.SpanWeight;
import org.apache.lucene.search.spans.Spans;
import org.apache.lucene.util.BytesRef;
@@ -92,7 +90,7 @@ public class SpanPayloadCheckQuery exten
public Spans getSpans(final LeafReaderContext context, Postings requiredPostings) throws IOException {
final PayloadChecker collector = new PayloadChecker();
Spans matchSpans = matchWeight.getSpans(context, requiredPostings.atLeast(Postings.PAYLOADS));
- return (matchSpans == null) ? null : new FilterSpans(matchSpans) {
+ return (matchSpans == null) ? null : new FilterSpans(matchSpans, getSimScorer(context)) {
@Override
protected AcceptStatus accept(Spans candidate) throws IOException {
collector.reset();
@@ -112,9 +110,7 @@ public class SpanPayloadCheckQuery exten
throw new IllegalStateException("field \"" + field + "\" was indexed without position data; cannot run SpanQuery (query=" + parentQuery + ")");
}
- Spans spans = getSpans(context, Postings.PAYLOADS);
- Similarity.SimScorer simScorer = simWeight == null ? null : similarity.simScorer(simWeight, context);
- return (spans == null) ? null : new SpanScorer(spans, this, simScorer);
+ return getSpans(context, Postings.PAYLOADS);
}
}
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java Thu Oct 22 11:30:51 2015
@@ -48,9 +48,9 @@ import org.apache.lucene.search.spans.Sp
import org.apache.lucene.search.spans.SpanNearQuery;
import org.apache.lucene.search.spans.SpanNotQuery;
import org.apache.lucene.search.spans.SpanQuery;
+import org.apache.lucene.search.spans.Spans;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.search.spans.SpanWeight;
-import org.apache.lucene.search.spans.Spans;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java Thu Oct 22 11:30:51 2015
@@ -41,8 +41,8 @@ import org.apache.lucene.search.similari
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.spans.MultiSpansWrapper;
import org.apache.lucene.search.spans.SpanQuery;
-import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.search.spans.Spans;
+import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.English;
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/payloads/PayloadSpanUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/payloads/PayloadSpanUtil.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/payloads/PayloadSpanUtil.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/payloads/PayloadSpanUtil.java Thu Oct 22 11:30:51 2015
@@ -38,9 +38,9 @@ import org.apache.lucene.search.TermQuer
import org.apache.lucene.search.spans.SpanNearQuery;
import org.apache.lucene.search.spans.SpanOrQuery;
import org.apache.lucene.search.spans.SpanQuery;
+import org.apache.lucene.search.spans.Spans;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.search.spans.SpanWeight;
-import org.apache.lucene.search.spans.Spans;
/**
* Experimental class to get set of payloads for most standard Lucene queries.
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpanWeight.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpanWeight.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpanWeight.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpanWeight.java Thu Oct 22 11:30:51 2015
@@ -27,6 +27,7 @@ import org.apache.lucene.index.TermConte
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.similarities.Similarity;
/**
* Wraps a SpanWeight with additional asserts
@@ -55,7 +56,12 @@ public class AssertingSpanWeight extends
Spans spans = in.getSpans(context, requiredPostings);
if (spans == null)
return null;
- return new AssertingSpans(spans);
+ return new AssertingSpans(spans, in.getSimScorer(context));
+ }
+
+ @Override
+ public Similarity.SimScorer getSimScorer(LeafReaderContext context) throws IOException {
+ return in.getSimScorer(context);
}
@Override
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpans.java?rev=1709993&r1=1709992&r2=1709993&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpans.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpans.java Thu Oct 22 11:30:51 2015
@@ -17,13 +17,14 @@ package org.apache.lucene.search.spans;
* limitations under the License.
*/
+import java.io.IOException;
+
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.TwoPhaseIterator;
-
-import java.io.IOException;
+import org.apache.lucene.search.similarities.Similarity;
/**
- * Wraps a Spans with additional asserts
+ * Wraps a Spans with additional asserts
*/
class AssertingSpans extends Spans {
final Spans in;
@@ -67,7 +68,8 @@ class AssertingSpans extends Spans {
State state = State.DOC_START;
- AssertingSpans(Spans in) {
+ AssertingSpans(Spans in, Similarity.SimScorer docScorer) {
+ super((SpanWeight)in.getWeight(), docScorer);
this.in = in;
}
@@ -187,7 +189,13 @@ class AssertingSpans extends Spans {
public long cost() {
return in.cost();
}
-
+
+ @Override
+ protected float scoreCurrentDoc() throws IOException {
+ assert in.docScorer != null : in.getClass() + " has no docScorer!";
+ return in.scoreCurrentDoc();
+ }
+
@Override
public TwoPhaseIterator asTwoPhaseIterator() {
final TwoPhaseIterator iterator = in.asTwoPhaseIterator();
@@ -196,7 +204,7 @@ class AssertingSpans extends Spans {
}
return new AssertingTwoPhaseView(iterator);
}
-
+
class AssertingTwoPhaseView extends TwoPhaseIterator {
final TwoPhaseIterator in;
int lastDoc = -1;