cleanup

Author: original-brownbear

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

@@ -15,6 +15,7 @@
 import org.elasticsearch.action.search.SearchPhaseController.TopDocsStats;
 import org.elasticsearch.common.breaker.CircuitBreaker;
 import org.elasticsearch.common.breaker.CircuitBreakingException;
+import org.elasticsearch.common.collect.Iterators;
 import org.elasticsearch.common.io.stream.DelayableWriteable;
 import org.elasticsearch.common.lucene.search.TopDocsAndMaxScore;
 import org.elasticsearch.common.util.concurrent.AbstractRunnable;
@@ -306,36 +307,29 @@ interface ReleasableIterator extends Iterator<InternalAggregations>, Releasable
 
             private Releasable toRelease;
 
-            private boolean onFirst;
-
             @Override
             public void close() {
                 Releasables.close(toRelease);
             }
 
             @Override
             public boolean hasNext() {
-                if (onFirst && lastMerge != null) {
-                    return true;
-                }
                 return toConsume.hasNext();
             }
 
             @Override
             public InternalAggregations next() {
-                if (onFirst) {
-                    onFirst = false;
-                    if (lastMerge != null) {
-                        return lastMerge.reducedAggs;
-                    }
-                }
                 var res = toConsume.next().consumeAggs();
                 Releasables.close(toRelease);
                 toRelease = res;
                 return res.expand();
             }
         }) {
-            return InternalAggregations.topLevelReduce(aggsIter, resultSetSize, reduceContext);
+            return InternalAggregations.topLevelReduce(
+                lastMerge == null ? aggsIter : Iterators.concat(Iterators.single(lastMerge.reducedAggs), aggsIter),
+                resultSetSize,
+                reduceContext
+            );
         } finally {
             toConsume.forEachRemaining(QuerySearchResult::releaseAggs);
         }