fvh: Also extract terms from the nested query' inner query.

Closes #19265
elastic · Jul 13, 2016 · 2bdc55c · 2bdc55c
1 parent d14e06c
commit 2bdc55c
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/core/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java b/core/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java
@@ -27,6 +27,7 @@
 import org.apache.lucene.search.PhraseQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.join.ToParentBlockJoinQuery;
 import org.apache.lucene.search.spans.SpanTermQuery;
 import org.elasticsearch.common.lucene.search.MultiPhrasePrefixQuery;
 import org.elasticsearch.common.lucene.search.function.FiltersFunctionScoreQuery;
@@ -71,6 +72,9 @@ void flatten(Query sourceQuery, IndexReader reader, Collection<Query> flatQuerie
         } else if (sourceQuery instanceof BlendedTermQuery) {
             final BlendedTermQuery blendedTermQuery = (BlendedTermQuery) sourceQuery;
             flatten(blendedTermQuery.rewrite(reader), reader, flatQueries, boost);
+        } else if (sourceQuery instanceof ToParentBlockJoinQuery) {
+            ToParentBlockJoinQuery blockJoinQuery = (ToParentBlockJoinQuery) sourceQuery;
+            flatten(blockJoinQuery.getChildQuery(), reader, flatQueries, boost);
         } else {
             super.flatten(sourceQuery, reader, flatQueries, boost);
         }

diff --git a/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java b/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java
@@ -19,10 +19,12 @@
 package org.elasticsearch.search.highlight;
 
 import com.carrotsearch.randomizedtesting.generators.RandomPicks;
+import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.support.WriteRequest;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.Settings.Builder;
@@ -64,6 +66,7 @@
 import static org.elasticsearch.index.query.QueryBuilders.matchPhraseQuery;
 import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
 import static org.elasticsearch.index.query.QueryBuilders.multiMatchQuery;
+import static org.elasticsearch.index.query.QueryBuilders.nestedQuery;
 import static org.elasticsearch.index.query.QueryBuilders.prefixQuery;
 import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery;
 import static org.elasticsearch.index.query.QueryBuilders.rangeQuery;
@@ -2649,4 +2652,43 @@ public void testStringFieldHighlighting() throws IOException {
         assertThat(search.getHits().totalHits(), equalTo(1L));
         assertThat(search.getHits().getAt(0).getHighlightFields().get("string_field").getFragments()[0].string(), equalTo("<em>some</em> <em>text</em>"));
     }
+
+    public void testACopyFieldWithNestedQuery() throws Exception {
+        String mapping = jsonBuilder().startObject().startObject("type").startObject("properties")
+                    .startObject("foo")
+                        .field("type", "nested")
+                        .startObject("properties")
+                            .startObject("text")
+                                .field("type", "text")
+                                .field("copy_to", "foo_text")
+                            .endObject()
+                        .endObject()
+                    .endObject()
+                    .startObject("foo_text")
+                        .field("type", "text")
+                        .field("term_vector", "with_positions_offsets")
+                        .field("store", true)
+                    .endObject()
+                .endObject().endObject().endObject().string();
+        prepareCreate("test").addMapping("type", mapping).get();
+
+        client().prepareIndex("test", "type", "1").setSource(jsonBuilder().startObject().startArray("foo")
+                    .startObject().field("text", "brown").endObject()
+                    .startObject().field("text", "cow").endObject()
+            .endArray().endObject())
+            .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
+            .get();
+
+        SearchResponse searchResponse = client().prepareSearch()
+                .setQuery(nestedQuery("foo", matchQuery("foo.text", "brown cow"), ScoreMode.None))
+                .highlighter(new HighlightBuilder()
+                        .field(new Field("foo_text").highlighterType("fvh"))
+                        .requireFieldMatch(false))
+                .get();
+        assertHitCount(searchResponse, 1);
+        HighlightField field = searchResponse.getHits().getAt(0).highlightFields().get("foo_text");
+        assertThat(field.getFragments().length, equalTo(2));
+        assertThat(field.getFragments()[0].string(), equalTo("<em>brown</em>"));
+        assertThat(field.getFragments()[1].string(), equalTo("<em>cow</em>"));
+    }
 }