Skip to content

Highlighting - does not work with custom_score or boosting, closes #1314 #1315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Highlighting - does not work with custom_score or boosting, closes #1314 #1315

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,18 @@
import org.apache.lucene.document.Field;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.BoostingQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.highlight.*;
import org.apache.lucene.search.vectorhighlight.*;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.common.collect.ImmutableMap;
import org.elasticsearch.common.io.FastStringReader;
import org.elasticsearch.common.lucene.document.SingleFieldSelector;
import org.elasticsearch.common.lucene.search.MoreLikeThisQuery;
import org.elasticsearch.common.lucene.search.MultiPhrasePrefixQuery;
import org.elasticsearch.common.lucene.search.function.FiltersFunctionScoreQuery;
import org.elasticsearch.common.lucene.search.function.FunctionScoreQuery;
import org.elasticsearch.index.mapper.DocumentMapper;
import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.index.mapper.MapperService;
Expand Down Expand Up @@ -110,7 +115,32 @@ public static class Encoders {
}
// Don't use the context.query() since it might be rewritten, and we need to pass the non rewritten queries to
// let the highlighter handle MultiTerm ones
QueryScorer queryScorer = new QueryScorer(context.parsedQuery().query(), null);
QueryScorer queryScorer;
if (context.parsedQuery().query() instanceof FunctionScoreQuery) {
queryScorer = new QueryScorer(((FunctionScoreQuery)context.parsedQuery().query()).getSubQuery(), null);
} else if (context.parsedQuery().query() instanceof FiltersFunctionScoreQuery) {
queryScorer = new QueryScorer(((FiltersFunctionScoreQuery)context.parsedQuery().query()).getSubQuery(), null);
} else if (context.parsedQuery().query() instanceof BoostingQuery) {
try {
queryScorer = new QueryScorer(((BoostingQuery)context.parsedQuery().query()).rewrite(hitContext.reader()), null);
} catch (IOException e) {
throw new ElasticSearchException("Failed rewriting BoostingQuery",e);
}
} else if (context.parsedQuery().query() instanceof MoreLikeThisQuery) {
try {
queryScorer = new QueryScorer(((MoreLikeThisQuery)context.parsedQuery().query()).rewrite(hitContext.reader()), null);
} catch (IOException e) {
throw new ElasticSearchException("Failed rewriting MoreLikeThisQuery",e);
}
} else if (context.parsedQuery().query() instanceof MultiPhrasePrefixQuery) {
try {
queryScorer = new QueryScorer(((MultiPhrasePrefixQuery)context.parsedQuery().query()).rewrite(hitContext.reader()), null);
} catch (IOException e) {
throw new ElasticSearchException("Failed rewriting MultiPhrasePrefixQuery",e);
}
} else {
queryScorer = new QueryScorer(context.parsedQuery().query(), null);
}
queryScorer.setExpandMultiTermQuery(true);
Fragmenter fragmenter;
if (field.numberOfFragments() == 0) {
Expand Down