Skip to content

Fix highlighter support in PinnedQuery and added test #53716

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

Merged
merged 2 commits into from
Mar 18, 2020
Merged

Fix highlighter support in PinnedQuery and added test #53716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4afeaf5
Fix highlighter support in PinnedQuery and added test
markharwood Mar 18, 2020
f2fce62
Changed delegation method so that a visitor can be informed of the ex…
markharwood Mar 18, 2020
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
5 changes: 5 additions & 0 deletions ...plugin/search-business-rules/src/main/java/org/apache/lucene/search/CappedScoreQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ public Query getQuery() {
return query;
}

@Override
public void visit(QueryVisitor visitor) {
query.visit(visitor.getSubVisitor(BooleanClause.Occur.MUST, this));
}

@Override
public Query rewrite(IndexReader reader) throws IOException {
Query rewritten = query.rewrite(reader);
Expand Down
27 changes: 27 additions & 0 deletions ...rules/src/test/java/org/elasticsearch/xpack/searchbusinessrules/PinnedQueryBuilderIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@
import org.elasticsearch.index.query.QueryStringQueryBuilder;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
import org.elasticsearch.search.fetch.subphase.highlight.HighlightField;
import org.elasticsearch.test.ESIntegTestCase;

import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;

import static org.elasticsearch.action.search.SearchType.DFS_QUERY_THEN_FETCH;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
Expand Down Expand Up @@ -196,5 +199,29 @@ public void testExplain() throws Exception {


}

public void testHighlight() throws Exception {
// Issue raised in https://github.com/elastic/elasticsearch/issues/53699
assertAcked(prepareCreate("test").setMapping(
jsonBuilder().startObject().startObject("_doc").startObject("properties").startObject("field1")
.field("analyzer", "whitespace").field("type", "text").endObject().endObject().endObject().endObject()));
ensureGreen();
client().prepareIndex("test").setId("1").setSource("field1", "the quick brown fox").get();
refresh();

PinnedQueryBuilder pqb = new PinnedQueryBuilder(QueryBuilders.matchQuery("field1", "the quick brown").operator(Operator.OR), "2");

HighlightBuilder testHighlighter = new HighlightBuilder();
testHighlighter.field("field1");

SearchResponse searchResponse = client().prepareSearch().setSearchType(SearchType.DFS_QUERY_THEN_FETCH).setQuery(pqb)
.highlighter(testHighlighter)
.setExplain(true).get();
assertHitCount(searchResponse, 1);
Map<String, HighlightField> highlights = searchResponse.getHits().getHits()[0].getHighlightFields();
assertThat(highlights.size(), equalTo(1));
HighlightField highlight = highlights.get("field1");
assertThat(highlight.fragments()[0].toString(), equalTo("<em>the</em> <em>quick</em> <em>brown</em> fox"));
}
}