diff --git a/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java b/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java index 777ffa2f90e..8c671cb3d2a 100644 --- a/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java +++ b/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java @@ -27,6 +27,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.Fieldable; import org.apache.lucene.search.ConstantScoreQuery; +import org.apache.lucene.search.FilteredQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.highlight.*; import org.apache.lucene.search.highlight.Formatter; @@ -142,6 +143,9 @@ public class HighlightPhase implements FetchSubPhase { query = q.getQuery(); extracted = true; } + } else if (query instanceof FilteredQuery) { + query = ((FilteredQuery) query).getQuery(); + extracted = true; } if (!extracted) { break;