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 2017/01/14 10:52:22 UTC
[4/4] lucene-solr:branch_6x: Add getMatchingChildren() method to
Scorer
Add getMatchingChildren() method to Scorer
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/966316f7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/966316f7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/966316f7
Branch: refs/heads/branch_6x
Commit: 966316f79cbc41ebbd78c03035333a8398b87912
Parents: c2c758b
Author: Alan Woodward <ro...@apache.org>
Authored: Sat Jan 14 09:08:02 2017 +0000
Committer: Alan Woodward <ro...@apache.org>
Committed: Sat Jan 14 10:32:14 2017 +0000
----------------------------------------------------------------------
lucene/CHANGES.txt | 4 +++
.../apache/lucene/search/DisjunctionScorer.java | 8 +++++
.../lucene/search/MinShouldMatchSumScorer.java | 9 ++++++
.../java/org/apache/lucene/search/Scorer.java | 8 +++++
.../search/TestBooleanQueryVisitSubscorers.java | 33 ++++++++++++++++++++
5 files changed, 62 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/966316f7/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 7dc7239..747eea3 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -71,6 +71,10 @@ New features
SortedSetDocValues to allow filtering their TermsEnums with a
CompiledAutomaton (Alan Woodward, Mike McCandless)
+* LUCENE-7628: Scorer now has a getMatchingChildren() method that will
+ return all child scorers positioned on the current document. (Alan
+ Woodward)
+
Bug Fixes
* LUCENE-7547: JapaneseTokenizerFactory was failing to close the
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/966316f7/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java b/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java
index c53942a..a76999e 100644
--- a/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java
+++ b/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java
@@ -202,4 +202,12 @@ abstract class DisjunctionScorer extends Scorer {
return children;
}
+ @Override
+ public Collection<ChildScorer> getMatchingChildren() throws IOException {
+ List<ChildScorer> children = new ArrayList<>();
+ for (DisiWrapper w = getSubMatches(); w != null; w = w.next) {
+ children.add(new ChildScorer(w.scorer, "SHOULD"));
+ }
+ return children;
+ }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/966316f7/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java b/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java
index 9653d95..1835669 100644
--- a/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java
+++ b/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java
@@ -135,6 +135,15 @@ final class MinShouldMatchSumScorer extends Scorer {
}
@Override
+ public Collection<ChildScorer> getMatchingChildren() throws IOException {
+ List<ChildScorer> children = new ArrayList<>();
+ for (DisiWrapper s = lead; s != null; s = s.next) {
+ children.add(new ChildScorer(s.scorer, "SHOULD"));
+ }
+ return children;
+ }
+
+ @Override
public DocIdSetIterator iterator() {
return new DocIdSetIterator() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/966316f7/lucene/core/src/java/org/apache/lucene/search/Scorer.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/Scorer.java b/lucene/core/src/java/org/apache/lucene/search/Scorer.java
index f434327..2e35e91 100644
--- a/lucene/core/src/java/org/apache/lucene/search/Scorer.java
+++ b/lucene/core/src/java/org/apache/lucene/search/Scorer.java
@@ -82,6 +82,14 @@ public abstract class Scorer {
public Collection<ChildScorer> getChildren() {
return Collections.emptyList();
}
+
+ /**
+ * Returns child sub-scorers that match the current document
+ * @lucene.experimental
+ */
+ public Collection<ChildScorer> getMatchingChildren() throws IOException {
+ return getChildren();
+ }
/** A child Scorer and its relationship to its parent.
* the meaning of the relationship depends upon the parent query.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/966316f7/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java
index 443246b..ca27a60 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java
@@ -108,6 +108,39 @@ public class TestBooleanQueryVisitSubscorers extends LuceneTestCase {
assertEquals(2, tfs.get(1).intValue()); // f2:search + f2:lucene
assertEquals(2, tfs.get(2).intValue()); // f2:search + f2:lucene
}
+
+ public void testDisjunctionMatches() throws IOException {
+ BooleanQuery.Builder bq1 = new BooleanQuery.Builder();
+ bq1.add(new TermQuery(new Term(F1, "lucene")), Occur.SHOULD);
+ bq1.add(new PhraseQuery(F2, "search", "engine"), Occur.SHOULD);
+
+ Weight w1 = scorerSearcher.createNormalizedWeight(bq1.build(), true);
+ Scorer s1 = w1.scorer(reader.leaves().get(0));
+ assertEquals(0, s1.iterator().nextDoc());
+ assertEquals(2, s1.getMatchingChildren().size());
+
+ BooleanQuery.Builder bq2 = new BooleanQuery.Builder();
+ bq2.add(new TermQuery(new Term(F1, "lucene")), Occur.SHOULD);
+ bq2.add(new PhraseQuery(F2, "search", "library"), Occur.SHOULD);
+
+ Weight w2 = scorerSearcher.createNormalizedWeight(bq2.build(), true);
+ Scorer s2 = w2.scorer(reader.leaves().get(0));
+ assertEquals(0, s2.iterator().nextDoc());
+ assertEquals(1, s2.getMatchingChildren().size());
+ }
+
+ public void testMinShouldMatchMatches() throws IOException {
+ BooleanQuery.Builder bq = new BooleanQuery.Builder();
+ bq.add(new TermQuery(new Term(F1, "lucene")), Occur.SHOULD);
+ bq.add(new TermQuery(new Term(F2, "lucene")), Occur.SHOULD);
+ bq.add(new PhraseQuery(F2, "search", "library"), Occur.SHOULD);
+ bq.setMinimumNumberShouldMatch(2);
+
+ Weight w = scorerSearcher.createNormalizedWeight(bq.build(), true);
+ Scorer s = w.scorer(reader.leaves().get(0));
+ assertEquals(0, s.iterator().nextDoc());
+ assertEquals(2, s.getMatchingChildren().size());
+ }
public void testConjunctions() throws IOException {
BooleanQuery.Builder bq = new BooleanQuery.Builder();