Apache Solr open-source search software
Revert "SOLR-15962: surround parser & highlighting: ensure works"
David Smileyf6fbd2bf19fd
diff --git a/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.javaindex c659a7035d3..e7519880b05 100644--- a/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java@@ -16,7 +16,6 @@*/package org.apache.solr.search;-import java.io.IOException;import org.apache.lucene.search.Query;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.SolrParams;@@ -100,19 +99,5 @@ public class SurroundQParserPlugin extends QParserPlugin {Query lquery = sq.makeLuceneQueryField(defaultField, bqFactory);return lquery;}-- @Override- public Query getHighlightQuery() throws SyntaxError {- // Some highlighters (certainly UnifiedHighlighter) doesn't support highlighting these- // queries in some modes because this special query doesn't implement visit() properly.- // By rewriting, we get a SpanQuery, which does. Sometimes this can be expensive like for- // some MultiTermQueries (MTQ) (e.g. a wildcard) but we don't expect it to be here.- try {- return getQuery().rewrite(req.getSearcher().getIndexReader());- } catch (IOException e) {- log.warn("Couldn't get rewritten query for highlighting", e);- return getQuery();- }- }}}