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 2016/03/25 15:47:15 UTC
[1/3] lucene-solr:master: LUCENE-7112:
WeightedSpanTermExtractor.extractUnknownQuery is only called on queries that
could not be extracted.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6_0 762000f22 -> 766b14404
refs/heads/branch_6x ca374d947 -> 259e69b76
refs/heads/master 6f60ac21f -> 9448bd007
LUCENE-7112: WeightedSpanTermExtractor.extractUnknownQuery is only called on queries that could not be extracted.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9448bd00
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9448bd00
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9448bd00
Branch: refs/heads/master
Commit: 9448bd007b0dbf091c4aa8666b323e0880fb07aa
Parents: 6f60ac2
Author: Adrien Grand <jp...@gmail.com>
Authored: Fri Mar 25 15:44:31 2016 +0100
Committer: Adrien Grand <jp...@gmail.com>
Committed: Fri Mar 25 15:45:43 2016 +0100
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
.../search/highlight/WeightedSpanTermExtractor.java | 7 ++++---
.../highlight/custom/HighlightCustomQueryTest.java | 15 +++++++++++++++
3 files changed, 22 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9448bd00/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 25b014d..16b3142 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -224,6 +224,9 @@ Bug Fixes
* LUCENE-7139: Fix bugs in geo3d's Vincenty surface distance
implementation (Karl Wright via Mike McCandless)
+* LUCENE-7112: WeightedSpanTermExtractor.extractUnknownQuery is only called
+ on queries that could not be extracted. (Adrien Grand)
+
Other
* LUCENE-7035: Upgrade icu4j to 56.1/unicode 8. (Robert Muir)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9448bd00/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
----------------------------------------------------------------------
diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
index 650be87..16b1d7b 100644
--- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
+++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
@@ -219,12 +219,13 @@ public class WeightedSpanTermExtractor {
rewritten = origQuery.rewrite(reader);
}
if (rewritten != origQuery) {
- // only rewrite once and then flatten again - the rewritten query could have a speacial treatment
+ // only rewrite once and then flatten again - the rewritten query could have a special treatment
// if this method is overwritten in a subclass or above in the next recursion
extract(rewritten, boost, terms);
- }
+ } else {
+ extractUnknownQuery(query, terms);
+ }
}
- extractUnknownQuery(query, terms);
}
protected void extractUnknownQuery(Query query,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9448bd00/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java
----------------------------------------------------------------------
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java
index 36c6d2a..bbb3bb9 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.lucene.search.highlight.custom;
+import org.apache.lucene.analysis.CannedTokenStream;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenFilter;
import org.apache.lucene.analysis.MockTokenizer;
@@ -35,6 +36,7 @@ import org.apache.lucene.search.highlight.WeightedSpanTermExtractor;
import org.apache.lucene.util.LuceneTestCase;
import java.io.IOException;
+import java.util.Collections;
import java.util.Map;
/**
@@ -82,6 +84,19 @@ public class HighlightCustomQueryTest extends LuceneTestCase {
}
+ public void testHighlightKnownQuery() throws IOException {
+ WeightedSpanTermExtractor extractor = new WeightedSpanTermExtractor() {
+ @Override
+ protected void extractUnknownQuery(Query query, Map<String,WeightedSpanTerm> terms) throws IOException {
+ terms.put("foo", new WeightedSpanTerm(3, "foo"));
+ }
+ };
+ Map<String,WeightedSpanTerm> terms = extractor.getWeightedSpanTerms(
+ new TermQuery(new Term("bar", "quux")), 3, new CannedTokenStream());
+ // no foo
+ assertEquals(Collections.singleton("quux"), terms.keySet());
+ }
+
/**
* This method intended for use with
* <tt>testHighlightingWithDefaultField()</tt>
[3/3] lucene-solr:branch_6_0: LUCENE-7112:
WeightedSpanTermExtractor.extractUnknownQuery is only called on queries that
could not be extracted.
Posted by jp...@apache.org.
LUCENE-7112: WeightedSpanTermExtractor.extractUnknownQuery is only called on queries that could not be extracted.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/766b1440
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/766b1440
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/766b1440
Branch: refs/heads/branch_6_0
Commit: 766b144044558272e155e6c29df2b66c7a33a19c
Parents: 762000f
Author: Adrien Grand <jp...@gmail.com>
Authored: Fri Mar 25 15:44:31 2016 +0100
Committer: Adrien Grand <jp...@gmail.com>
Committed: Fri Mar 25 15:46:31 2016 +0100
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
.../search/highlight/WeightedSpanTermExtractor.java | 7 ++++---
.../highlight/custom/HighlightCustomQueryTest.java | 15 +++++++++++++++
3 files changed, 22 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/766b1440/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 15b3b7ae..51657b8 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -184,6 +184,9 @@ Bug Fixes
* LUCENE-7139: Fix bugs in geo3d's Vincenty surface distance
implementation (Karl Wright via Mike McCandless)
+* LUCENE-7112: WeightedSpanTermExtractor.extractUnknownQuery is only called
+ on queries that could not be extracted. (Adrien Grand)
+
Other
* LUCENE-7035: Upgrade icu4j to 56.1/unicode 8. (Robert Muir)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/766b1440/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
----------------------------------------------------------------------
diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
index 650be87..16b1d7b 100644
--- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
+++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
@@ -219,12 +219,13 @@ public class WeightedSpanTermExtractor {
rewritten = origQuery.rewrite(reader);
}
if (rewritten != origQuery) {
- // only rewrite once and then flatten again - the rewritten query could have a speacial treatment
+ // only rewrite once and then flatten again - the rewritten query could have a special treatment
// if this method is overwritten in a subclass or above in the next recursion
extract(rewritten, boost, terms);
- }
+ } else {
+ extractUnknownQuery(query, terms);
+ }
}
- extractUnknownQuery(query, terms);
}
protected void extractUnknownQuery(Query query,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/766b1440/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java
----------------------------------------------------------------------
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java
index 36c6d2a..bbb3bb9 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.lucene.search.highlight.custom;
+import org.apache.lucene.analysis.CannedTokenStream;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenFilter;
import org.apache.lucene.analysis.MockTokenizer;
@@ -35,6 +36,7 @@ import org.apache.lucene.search.highlight.WeightedSpanTermExtractor;
import org.apache.lucene.util.LuceneTestCase;
import java.io.IOException;
+import java.util.Collections;
import java.util.Map;
/**
@@ -82,6 +84,19 @@ public class HighlightCustomQueryTest extends LuceneTestCase {
}
+ public void testHighlightKnownQuery() throws IOException {
+ WeightedSpanTermExtractor extractor = new WeightedSpanTermExtractor() {
+ @Override
+ protected void extractUnknownQuery(Query query, Map<String,WeightedSpanTerm> terms) throws IOException {
+ terms.put("foo", new WeightedSpanTerm(3, "foo"));
+ }
+ };
+ Map<String,WeightedSpanTerm> terms = extractor.getWeightedSpanTerms(
+ new TermQuery(new Term("bar", "quux")), 3, new CannedTokenStream());
+ // no foo
+ assertEquals(Collections.singleton("quux"), terms.keySet());
+ }
+
/**
* This method intended for use with
* <tt>testHighlightingWithDefaultField()</tt>
[2/3] lucene-solr:branch_6x: LUCENE-7112:
WeightedSpanTermExtractor.extractUnknownQuery is only called on queries that
could not be extracted.
Posted by jp...@apache.org.
LUCENE-7112: WeightedSpanTermExtractor.extractUnknownQuery is only called on queries that could not be extracted.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/259e69b7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/259e69b7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/259e69b7
Branch: refs/heads/branch_6x
Commit: 259e69b76fe1b6ac4f2dbfbca18cf4c2316ea62f
Parents: ca374d9
Author: Adrien Grand <jp...@gmail.com>
Authored: Fri Mar 25 15:44:31 2016 +0100
Committer: Adrien Grand <jp...@gmail.com>
Committed: Fri Mar 25 15:46:17 2016 +0100
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
.../search/highlight/WeightedSpanTermExtractor.java | 7 ++++---
.../highlight/custom/HighlightCustomQueryTest.java | 15 +++++++++++++++
3 files changed, 22 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/259e69b7/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 244609d..bef81ca 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -217,6 +217,9 @@ Bug Fixes
* LUCENE-7139: Fix bugs in geo3d's Vincenty surface distance
implementation (Karl Wright via Mike McCandless)
+* LUCENE-7112: WeightedSpanTermExtractor.extractUnknownQuery is only called
+ on queries that could not be extracted. (Adrien Grand)
+
Other
* LUCENE-7035: Upgrade icu4j to 56.1/unicode 8. (Robert Muir)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/259e69b7/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
----------------------------------------------------------------------
diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
index 650be87..16b1d7b 100644
--- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
+++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
@@ -219,12 +219,13 @@ public class WeightedSpanTermExtractor {
rewritten = origQuery.rewrite(reader);
}
if (rewritten != origQuery) {
- // only rewrite once and then flatten again - the rewritten query could have a speacial treatment
+ // only rewrite once and then flatten again - the rewritten query could have a special treatment
// if this method is overwritten in a subclass or above in the next recursion
extract(rewritten, boost, terms);
- }
+ } else {
+ extractUnknownQuery(query, terms);
+ }
}
- extractUnknownQuery(query, terms);
}
protected void extractUnknownQuery(Query query,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/259e69b7/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java
----------------------------------------------------------------------
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java
index 36c6d2a..bbb3bb9 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.lucene.search.highlight.custom;
+import org.apache.lucene.analysis.CannedTokenStream;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenFilter;
import org.apache.lucene.analysis.MockTokenizer;
@@ -35,6 +36,7 @@ import org.apache.lucene.search.highlight.WeightedSpanTermExtractor;
import org.apache.lucene.util.LuceneTestCase;
import java.io.IOException;
+import java.util.Collections;
import java.util.Map;
/**
@@ -82,6 +84,19 @@ public class HighlightCustomQueryTest extends LuceneTestCase {
}
+ public void testHighlightKnownQuery() throws IOException {
+ WeightedSpanTermExtractor extractor = new WeightedSpanTermExtractor() {
+ @Override
+ protected void extractUnknownQuery(Query query, Map<String,WeightedSpanTerm> terms) throws IOException {
+ terms.put("foo", new WeightedSpanTerm(3, "foo"));
+ }
+ };
+ Map<String,WeightedSpanTerm> terms = extractor.getWeightedSpanTerms(
+ new TermQuery(new Term("bar", "quux")), 3, new CannedTokenStream());
+ // no foo
+ assertEquals(Collections.singleton("quux"), terms.keySet());
+ }
+
/**
* This method intended for use with
* <tt>testHighlightingWithDefaultField()</tt>