save condition

Author: original-brownbear

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

@@ -220,9 +220,6 @@ public SearchPhaseController.ReducedQueryPhase reduce() throws Exception {
             consumePartialMergeResult(batchedResult.v2(), topDocsList, aggsList);
         }
         for (QuerySearchResult result : buffer) {
-            if (result.isReduced()) {
-                continue;
-            }
             topDocsStats.add(result.topDocs(), result.searchTimedOut(), result.terminatedEarly());
             if (topDocsList != null) {
                 TopDocsAndMaxScore topDocs = result.consumeTopDocs();
@@ -350,7 +347,7 @@ private MergeResult partialReduce(
         } finally {
             releaseAggs(toConsume);
             for (QuerySearchResult querySearchResult : toConsume) {
-                querySearchResult.setReduced();
+                querySearchResult.markAsPartiallyReduced();
             }
         }
         if (lastMerge != null) {
@@ -413,8 +410,8 @@ private void consume(QuerySearchResult result, Runnable next) {
         if (hasFailure()) {
             result.consumeAll();
             next.run();
-        } else if (result.isNull() || result.isReduced()) {
-            if (result.isReduced()) {
+        } else if (result.isNull() || result.isPartiallyReduced()) {
+            if (result.isPartiallyReduced()) {
                 if (result.hasConsumedTopDocs() == false) {
                     result.consumeTopDocs();
                 }

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

@@ -91,7 +91,8 @@ protected static void releaseIrrelevantSearchContext(SearchPhaseResult searchPha
             ? searchPhaseResult.queryResult()
             : searchPhaseResult.rankFeatureResult();
         if (phaseResult != null
-            && (phaseResult.hasSearchContext() || (phaseResult instanceof QuerySearchResult q && q.isReduced() && q.getContextId() != null))
+            && (phaseResult.hasSearchContext()
+                || (phaseResult instanceof QuerySearchResult q && q.isPartiallyReduced() && q.getContextId() != null))
             && context.getRequest().scroll() == null
             && (context.isPartOfPointInTime(phaseResult.getContextId()) == false)) {
             try {

server/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java

@@ -143,13 +143,16 @@ public QuerySearchResult queryResult() {
         return this;
     }
 
-    public boolean isReduced() {
+    /**
+     * @return true if this result was already partially reduced on the data node that it originated on
+     */
+    public boolean isPartiallyReduced() {
         return reduced;
     }
 
-    public void setReduced() {
+    public void markAsPartiallyReduced() {
         assert (hasConsumedTopDocs() || topDocsAndMaxScore.topDocs.scoreDocs.length == 0) && aggregations == null
-            : topDocsAndMaxScore + " " + aggregations;
+            : "result not yet partially reduced [" + topDocsAndMaxScore + "][" + aggregations + "]";
         this.reduced = true;
     }