diff --git a/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java index 917ff06c573..da481b7a4a8 100644 --- a/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java +++ b/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java @@ -91,7 +91,8 @@ final class ExpandSearchPhase extends SearchPhase { SearchSourceBuilder sourceBuilder = buildExpandSearchSourceBuilder(innerHitBuilder, innerCollapseBuilder) .query(groupQuery) .postFilter(searchRequest.source().postFilter()); - SearchRequest groupRequest = buildExpandSearchRequest(searchRequest, sourceBuilder); + SearchRequest groupRequest = new SearchRequest(searchRequest); + groupRequest.source(sourceBuilder); multiRequest.add(groupRequest); } } @@ -120,22 +121,6 @@ final class ExpandSearchPhase extends SearchPhase { } } - private SearchRequest buildExpandSearchRequest(SearchRequest orig, SearchSourceBuilder sourceBuilder) { - SearchRequest groupRequest = new SearchRequest(orig.indices()) - .types(orig.types()) - .source(sourceBuilder) - .indicesOptions(orig.indicesOptions()) - .requestCache(orig.requestCache()) - .preference(orig.preference()) - .routing(orig.routing()) - .searchType(orig.searchType()); - if (orig.allowPartialSearchResults() != null){ - groupRequest.allowPartialSearchResults(orig.allowPartialSearchResults()); - } - groupRequest.setMaxConcurrentShardRequests(orig.getMaxConcurrentShardRequests()); - return groupRequest; - } - private SearchSourceBuilder buildExpandSearchSourceBuilder(InnerHitBuilder options, CollapseBuilder innerCollapseBuilder) { SearchSourceBuilder groupSource = new SearchSourceBuilder(); groupSource.from(options.getFrom());