Skip to content

Commit d61fbdb

Browse files
committed
19106: Fix for Unified highlighter with nested fields when match_phrase_prefix
1 parent 5e6ee97 commit d61fbdb

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

server/src/main/java/org/opensearch/lucene/search/uhighlight/CustomUnifiedHighlighter.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import org.opensearch.common.Nullable;
5353
import org.opensearch.common.lucene.search.MultiPhrasePrefixQuery;
5454
import org.opensearch.index.IndexSettings;
55+
import org.opensearch.index.search.OpenSearchToParentBlockJoinQuery;
5556

5657
import java.io.IOException;
5758
import java.text.BreakIterator;
@@ -262,7 +263,11 @@ private Collection<Query> rewriteCustomQuery(Query query) {
262263
// if original slop is 0 then require inOrder
263264
boolean inorder = (mpq.getSlop() == 0);
264265
return Collections.singletonList(new SpanNearQuery(positionSpanQueries, mpq.getSlop() + positionGaps, inorder));
265-
} else {
266+
}
267+
else if (query instanceof OpenSearchToParentBlockJoinQuery) {
268+
return Collections.singletonList(((OpenSearchToParentBlockJoinQuery) query).getChildQuery());
269+
}
270+
else {
266271
return null;
267272
}
268273
}

0 commit comments

Comments
 (0)