mirror of https://github.com/apache/lucene.git
Merge remote-tracking branch 'laurent/functionquery-as-unrecognizedquery-in-unifiedhighlighter' into functionquery-as-unrecognizedquery-in-unifiedhighlighter
This commit is contained in:
commit
c16bd20cc0
|
@ -49,6 +49,7 @@ import org.apache.lucene.index.StoredFieldVisitor;
|
||||||
import org.apache.lucene.index.StoredFields;
|
import org.apache.lucene.index.StoredFields;
|
||||||
import org.apache.lucene.index.Term;
|
import org.apache.lucene.index.Term;
|
||||||
import org.apache.lucene.index.TermVectors;
|
import org.apache.lucene.index.TermVectors;
|
||||||
|
import org.apache.lucene.queries.function.FunctionQuery;
|
||||||
import org.apache.lucene.queries.spans.SpanQuery;
|
import org.apache.lucene.queries.spans.SpanQuery;
|
||||||
import org.apache.lucene.search.DocIdSetIterator;
|
import org.apache.lucene.search.DocIdSetIterator;
|
||||||
import org.apache.lucene.search.IndexSearcher;
|
import org.apache.lucene.search.IndexSearcher;
|
||||||
|
@ -1130,7 +1131,9 @@ public class UnifiedHighlighter {
|
||||||
@Override
|
@Override
|
||||||
public void visitLeaf(Query query) {
|
public void visitLeaf(Query query) {
|
||||||
if (MultiTermHighlighting.canExtractAutomataFromLeafQuery(query) == false) {
|
if (MultiTermHighlighting.canExtractAutomataFromLeafQuery(query) == false) {
|
||||||
if (!(query instanceof MatchAllDocsQuery || query instanceof MatchNoDocsQuery)) {
|
if (!(query instanceof MatchAllDocsQuery
|
||||||
|
|| query instanceof MatchNoDocsQuery
|
||||||
|
|| query instanceof FunctionQuery)) {
|
||||||
hasUnknownLeaf[0] = true;
|
hasUnknownLeaf[0] = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue