Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16112: DefaultSolrHighlighter.doHighlighting to rewrite sufficiently (#756)

Christine Poerschke3bed330993f7
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0ed0e5dff96..aae1da49476 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -53,6 +53,8 @@ Bug Fixes
* SOLR-16089: Fix empty columns in Cloud Node UI Screen when replica is in down state. (hossman)
+* SOLR-16112: DefaultSolrHighlighter.doHighlighting to Query#rewrite multiple times if necessary. (Christine Poerschke)
+
Other Changes
---------------------
* SOLR-15776: Admin UI is now aware of logged-in user's permissions and can adapt accordingly (janhoy)
diff --git a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
index b7992aaf0ec..24974d2541a 100644
--- a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
+++ b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
@@ -453,11 +453,12 @@ public class DefaultSolrHighlighter extends SolrHighlighter implements PluginInf
&& !(Boolean.valueOf(params.get(HighlightParams.USE_PHRASE_HIGHLIGHTER, "true"))
&& Boolean.valueOf(params.get(HighlightParams.HIGHLIGHT_MULTI_TERM, "true")));
+ SolrIndexSearcher searcher = req.getSearcher();
+
if (rewrite) {
- query = query.rewrite(req.getSearcher().getIndexReader());
+ query = searcher.rewrite(query);
}
- SolrIndexSearcher searcher = req.getSearcher();
IndexSchema schema = searcher.getSchema();
// fetch unique key if one exists.
diff --git a/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java b/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java
index 5536d6a98e5..1ccc8a7ef53 100644
--- a/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java
+++ b/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java
@@ -844,6 +844,22 @@ public class HighlighterTest extends SolrTestCaseJ4 {
oldHighlight3);
}
+ @Test
+ public void testPhraseHighlighterComplexPhrase() {
+ assertU(adoc("t_text", "abc hello xyz", "id", "1"));
+ assertU(commit());
+ assertU(optimize());
+
+ assertQ(
+ req(
+ "q", "{!complexphrase}t_text:\"hello*\"",
+ "hl", "true",
+ "hl.fl", "t_text",
+ "hl.usePhraseHighlighter", "false"),
+ "//lst[@name='highlighting']/lst[@name='1']",
+ "//lst[@name='1']/arr[@name='t_text']/str[.='abc <em>hello</em> xyz']");
+ }
+
@Test
public void testGetHighlightFields() {
HashMap<String, String> args = new HashMap<>();