iter

Author: pmpailis

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

@@ -27,6 +27,7 @@
 public class SearchProfileCoordinatorResult implements Writeable, ToXContentFragment {
 
     private final String nodeId;
+    private long tookInMillis;
     private final RetrieverProfileResult retrieverProfileResult;
     private final Map<String, Long> breakdownMap;
 
@@ -38,13 +39,15 @@ public SearchProfileCoordinatorResult(String nodeId, RetrieverProfileResult retr
 
     public SearchProfileCoordinatorResult(StreamInput in) throws IOException {
         nodeId = in.readString();
+        tookInMillis = in.readLong();
         retrieverProfileResult = in.readOptionalWriteable(RetrieverProfileResult::new);
         breakdownMap = in.readMap(StreamInput::readString, StreamInput::readLong);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(nodeId);
+        out.writeLong(tookInMillis);
         out.writeOptionalWriteable(retrieverProfileResult);
         out.writeMap(breakdownMap, StreamOutput::writeString, StreamOutput::writeLong);
     }
@@ -53,13 +56,16 @@ public String getNodeId() {
         return this.nodeId;
     }
 
-    public RetrieverProfileResult getRetrieverProfileResult() {
-        return this.retrieverProfileResult;
+    public void setTookInMillis(long tookInMillis) {
+        this.tookInMillis = tookInMillis;
     }
 
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         builder.field("node_id", nodeId);
+        if (tookInMillis != -1) {
+            builder.field("took_in_millis", tookInMillis);
+        }
         if (retrieverProfileResult != null) {
             builder.field("retriever", retrieverProfileResult);
         }
@@ -75,13 +81,14 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;
         SearchProfileCoordinatorResult that = (SearchProfileCoordinatorResult) o;
         return nodeId.equals(that.nodeId)
+            && tookInMillis == that.tookInMillis
             && Objects.equals(retrieverProfileResult, that.retrieverProfileResult)
             && Objects.equals(breakdownMap, that.breakdownMap);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(nodeId, retrieverProfileResult, breakdownMap);
+        return Objects.hash(nodeId, tookInMillis, retrieverProfileResult, breakdownMap);
     }
 
     @Override

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

@@ -153,7 +153,7 @@ public void onResponse(MultiSearchResponse items) {
                                         listener.onFailure(new IllegalStateException("Coordinator profile results are missing"));
                                     }
                                     SearchProfileCoordinatorResult nestedResult = item.getResponse().getCoordinatorProfileResults();
-                                    nestedResult.getRetrieverProfileResult().setTookInMillis(item.getResponse().getTookInMillis());
+                                    nestedResult.setTookInMillis(item.getResponse().getTookInMillis());
                                     profiler.captureInnerRetrieverResult(innerRetrievers.get(i).retriever().getName(), nestedResult);
                                 }
                             }

server/src/test/java/org/elasticsearch/action/search/RankFeaturePhaseTests.java

@@ -900,7 +900,8 @@ public ScoreDoc[] rankQueryPhaseResults(
             ) {
                 List<ScoreDoc> docScores = new ArrayList<>();
                 for (QuerySearchResult phaseResults : rankSearchResults) {
-                    docScores.addAll(Arrays.asList(phaseResults.topDocs().topDocs.scoreDocs));
+                    assert phaseResults.getRankShardResult() != null;
+                    docScores.addAll(Arrays.asList(((RankFeatureShardResult) phaseResults.getRankShardResult()).rankFeatureDocs));
                 }
                 ScoreDoc[] sortedDocs = docScores.toArray(new ScoreDoc[0]);
                 // negating scores