iter

Author: pmpailis

modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/30_search_template.yml

@@ -137,7 +137,7 @@
 
   - match: { hits.total: 1 }
   - length: { hits.hits: 1 }
-  - length: { profile: 1 }
+  - length: { profile: 2 }
 
 ---
 "Test with new response format":

server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java

@@ -97,7 +97,7 @@ public QueryPhaseResultConsumer(
         this.queryPhaseRankCoordinatorContext = source == null || source.rankBuilder() == null
             ? null
             : source.rankBuilder().buildQueryPhaseCoordinatorContext(size, from);
-        this.hasTopDocs = (source == null || size != 0) && queryPhaseRankCoordinatorContext == null;
+        this.hasTopDocs = (source == null || size != 0) && queryPhaseRankCoordinatorContext == null || source.rankBuilder() != null;
         this.hasAggs = source != null && source.aggregations() != null;
         this.aggReduceContextBuilder = hasAggs ? controller.getReduceContext(isCanceled, source.aggregations()) : null;
         int batchReduceSize = (hasAggs || hasTopDocs) ? Math.min(request.getBatchedReduceSize(), expectedResultSize) : expectedResultSize;

server/src/main/java/org/elasticsearch/search/profile/SearchProfileCoordinatorResult.java

@@ -54,11 +54,7 @@ public String getNodeId() {
     }
 
     public RetrieverProfileResult getRetrieverProfileResult() {
-        return retrieverProfileResult;
-    }
-
-    public Map<String, Long> getBreakdownMap() {
-        return breakdownMap;
+        return this.retrieverProfileResult;
     }
 
     @Override

server/src/main/java/org/elasticsearch/search/profile/coordinator/RetrieverProfileResult.java

@@ -17,15 +17,15 @@
 import org.elasticsearch.xcontent.XContentBuilder;
 
 import java.io.IOException;
-import java.util.List;
+import java.util.Map;
 
 public class RetrieverProfileResult implements ToXContentObject, Writeable {
 
     private final String name;
     private long tookInMillis;
-    private final List<SearchProfileCoordinatorResult> children;
+    private final Map<String, SearchProfileCoordinatorResult> children;
 
-    public RetrieverProfileResult(String name, long tookInMillis, List<SearchProfileCoordinatorResult> children) {
+    public RetrieverProfileResult(String name, long tookInMillis, Map<String, SearchProfileCoordinatorResult> children) {
         this.name = name;
         this.tookInMillis = tookInMillis;
         this.children = children;
@@ -34,14 +34,14 @@ public RetrieverProfileResult(String name, long tookInMillis, List<SearchProfile
     public RetrieverProfileResult(StreamInput in) throws IOException {
         name = in.readString();
         tookInMillis = in.readLong();
-        children = in.readCollectionAsList(SearchProfileCoordinatorResult::new);
+        children = in.readMap(StreamInput::readString, SearchProfileCoordinatorResult::new);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(name);
         out.writeLong(tookInMillis);
-        out.writeCollection(children);
+        out.writeMap(children, StreamOutput::writeString, StreamOutput::writeWriteable);
     }
 
     @Override
@@ -53,9 +53,11 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         }
         if (false == children.isEmpty()) {
             builder.startArray("children");
-            for (SearchProfileCoordinatorResult child : children) {
+            for (Map.Entry<String, SearchProfileCoordinatorResult> child : children.entrySet()) {
                 builder.startObject();
-                child.toXContent(builder, params);
+                builder.startObject(child.getKey());
+                child.getValue().toXContent(builder, params);
+                builder.endObject();
                 builder.endObject();
             }
             builder.endArray();
@@ -65,13 +67,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         return builder;
     }
 
-    public List<SearchProfileCoordinatorResult> getChildren() {
-        return children;
-    }
-
-    public void addChild(SearchProfileCoordinatorResult profileResult) {
+    public void addChild(String name, SearchProfileCoordinatorResult profileResult) {
         assert profileResult != null;
-        children.add(profileResult);
+        children.put(name, profileResult);
     }
 
     public void setTookInMillis(long tookInMillis) {

server/src/main/java/org/elasticsearch/search/profile/coordinator/SearchCoordinatorProfiler.java

@@ -22,11 +22,11 @@ public SearchCoordinatorProfiler(final String nodeId) {
         this.nodeId = nodeId;
     }
 
-    public void captureInnerRetrieverResult(SearchProfileCoordinatorResult profileResult) {
+    public void captureInnerRetrieverResult(String name, SearchProfileCoordinatorResult profileResult) {
         if (retriever == null) {
             throw new IllegalArgumentException("parent [retriever] results have not been initialized");
         }
-        retriever.addChild(profileResult);
+        retriever.addChild(name, profileResult);
     }
 
     public void captureRetrieverTookInMillis(long tookInMillis) {

server/src/main/java/org/elasticsearch/search/retriever/CompoundRetrieverBuilder.java

@@ -18,6 +18,7 @@
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.TransportMultiSearchAction;
+import org.elasticsearch.common.util.Maps;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryRewriteContext;
@@ -89,7 +90,9 @@ public final RetrieverBuilder rewrite(QueryRewriteContext ctx) throws IOExceptio
         final SearchCoordinatorProfiler profiler = ctx.profiler();
         Timer rewriteTimer = null;
         if (profiler != null && profiler.getRetriever() == null) {
-            profiler.retriever(new RetrieverProfileResult(this.getName(), -1, new ArrayList<>(innerRetrievers.size())));
+            profiler.retriever(
+                new RetrieverProfileResult(this.getName(), -1, Maps.newConcurrentHashMapWithExpectedSize(innerRetrievers.size()))
+            );
             rewriteTimer = profiler.getNewTimer(SearchCoordinatorTimingType.RETRIEVER_REWRITE);
             rewriteTimer.start();
         }
@@ -150,7 +153,8 @@ public void onResponse(MultiSearchResponse items) {
                                         listener.onFailure(new IllegalStateException("Coordinator profile results are missing"));
                                     }
                                     SearchProfileCoordinatorResult nestedResult = item.getResponse().getCoordinatorProfileResults();
-                                    profiler.captureInnerRetrieverResult(nestedResult);
+                                    nestedResult.getRetrieverProfileResult().setTookInMillis(item.getResponse().getTookInMillis());
+                                    profiler.captureInnerRetrieverResult(innerRetrievers.get(i).retriever().getName(), nestedResult);
                                 }
                             }
                         }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankBuilder.java

@@ -157,13 +157,11 @@ public Explanation explainHit(Explanation baseExplanation, RankDoc scoreDoc, Lis
     @Override
     public QueryPhaseRankShardContext buildQueryPhaseShardContext(List<Query> queries, int from) {
         return null;
-        // return new RerankingQueryPhaseRankShardContext(queries, rankWindowSize());
     }
 
     @Override
     public QueryPhaseRankCoordinatorContext buildQueryPhaseCoordinatorContext(int size, int from) {
         return null;
-        // return new RerankingQueryPhaseRankCoordinatorContext(rankWindowSize());
     }
 
     @Override