Fix fetch source option in expand search phase (#37908)

This change fixes the copy of the fetch source option into the expand search request that is used to retrieve the documents of each collapsed group. Closes #23829
elastic · Jan 30, 2019 · 2732bb5 · 2732bb5
1 parent 5dcc805
commit 2732bb5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java
@@ -129,7 +129,8 @@ private SearchSourceBuilder buildExpandSearchSourceBuilder(InnerHitBuilder optio
             options.getSorts().forEach(groupSource::sort);
         }
         if (options.getFetchSourceContext() != null) {
-            if (options.getFetchSourceContext().includes() == null && options.getFetchSourceContext().excludes() == null) {
+            if (options.getFetchSourceContext().includes().length == 0 &&
+                    options.getFetchSourceContext().excludes().length == 0) {
                 groupSource.fetchSource(options.getFetchSourceContext().fetchSource());
             } else {
                 groupSource.fetchSource(options.getFetchSourceContext().includes(),

diff --git a/server/src/test/java/org/elasticsearch/action/search/ExpandSearchPhaseTests.java b/server/src/test/java/org/elasticsearch/action/search/ExpandSearchPhaseTests.java
@@ -252,13 +252,17 @@ void sendExecuteMultiSearch(MultiSearchRequest request, SearchTask task, ActionL
                 assertTrue(request.requests().stream().allMatch((r) -> version == r.source().version()));
                 assertTrue(request.requests().stream().allMatch((r) -> seqNoAndTerm == r.source().seqNoAndPrimaryTerm()));
                 assertTrue(request.requests().stream().allMatch((r) -> postFilter.equals(r.source().postFilter())));
+                assertTrue(request.requests().stream().allMatch((r) -> r.source().fetchSource().fetchSource() == false));
+                assertTrue(request.requests().stream().allMatch((r) -> r.source().fetchSource().includes().length == 0));
+                assertTrue(request.requests().stream().allMatch((r) -> r.source().fetchSource().excludes().length == 0));
             }
         };
         mockSearchPhaseContext.getRequest().source(new SearchSourceBuilder()
             .collapse(
                 new CollapseBuilder("someField")
                     .setInnerHits(new InnerHitBuilder().setName("foobarbaz").setVersion(version).setSeqNoAndPrimaryTerm(seqNoAndTerm))
             )
+            .fetchSource(false)
             .postFilter(QueryBuilders.existsQuery("foo")))
             .preference("foobar")
             .routing("baz");