honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed doc_id used in combination with context.searcher(), needs to be topLevelId rather than just docId 

Improved test to catch this problem calling refresh more frequently and having the word to highlight in different positions in the text

Closes #4103
This commit is contained in:
Luca Cavanna 2013-11-06 01:08:14 +01:00
parent ebc8975efd
commit a3e355d40e
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java
View File

@ -109,7 +109,7 @@ public class PostingsHighlighter implements Highlighter {
//we highlight every value separately calling the highlight method multiple times, only if we need to have back a snippet per value (whole value)
int values = mergeValues ? 1 : textsToHighlight.size();
for (int i = 0; i < values; i++) {
Snippet[] fieldSnippets = highlighter.highlightDoc(highlighterContext.fieldName, mapperHighlighterEntry.filteredQueryTerms, context.searcher(), hitContext.docId(), numberOfFragments);
Snippet[] fieldSnippets = highlighter.highlightDoc(highlighterContext.fieldName, mapperHighlighterEntry.filteredQueryTerms, context.searcher(), hitContext.topLevelDocId(), numberOfFragments);
if (fieldSnippets != null) {
for (Snippet fieldSnippet : fieldSnippets) {
if (Strings.hasText(fieldSnippet.getText())) {

19
src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java
View File

@ -47,6 +47,7 @@ import org.junit.Test;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import static org.elasticsearch.action.search.SearchType.QUERY_THEN_FETCH;
@ -2623,9 +2624,19 @@ public class HighlighterSearchTests extends AbstractIntegrationTest {
ensureGreen();
int COUNT = between(20, 100);
Map<String, String> prefixes = new HashMap<String, String>(COUNT);
logger.info("--> indexing docs");
for (int i = 0; i < COUNT; i++) {
client().prepareIndex("test", "type1", Integer.toString(i)).setSource("field1", "Sentence test " + i + ". Sentence two.").get();
//generating text with word to highlight in a different position
//(https://github.com/elasticsearch/elasticsearch/issues/4103)
String prefix = randomAsciiOfLengthBetween(5, 30);
prefixes.put(String.valueOf(i), prefix);
client().prepareIndex("test", "type1", Integer.toString(i)).setSource("field1", "Sentence " + prefix
+ " test. Sentence two.").get();
if (frequently()) {
refresh();
}
}
refresh();
@ -2638,7 +2649,8 @@ public class HighlighterSearchTests extends AbstractIntegrationTest {
assertHitCount(searchResponse, (long)COUNT);
assertThat(searchResponse.getHits().hits().length, equalTo(COUNT));
for (SearchHit hit : searchResponse.getHits()) {
assertThat(hit.highlightFields().get("field1").fragments()[0].string(), equalTo("Sentence <em>test</em> " + hit.id() + "."));
String prefix = prefixes.get(hit.id());
assertThat(hit.highlightFields().get("field1").fragments()[0].string(), equalTo("Sentence " + prefix + " <em>test</em>."));
}
logger.info("--> searching explicitly on field1 and highlighting on it, with DFS");
@ -2651,7 +2663,8 @@ public class HighlighterSearchTests extends AbstractIntegrationTest {
assertHitCount(searchResponse, (long)COUNT);
assertThat(searchResponse.getHits().hits().length, equalTo(COUNT));
for (SearchHit hit : searchResponse.getHits()) {
assertThat(hit.highlightFields().get("field1").fragments()[0].string(), equalTo("Sentence <em>test</em> " + hit.id() + "."));
String prefix = prefixes.get(hit.id());
assertThat(hit.highlightFields().get("field1").fragments()[0].string(), equalTo("Sentence " + prefix + " <em>test</em>."));
}
}
}