1
0
Эх сурвалжийг харах

Use SearchRequest copy constructor in ExpandSearchPhase (#36772)

Relates to #36641
Luca Cavanna 6 жил өмнө
parent
commit
d2ce576c8c

+ 2 - 17
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());