From 87f146d3b7ea4550aade08cd0dfcdcea76fe2f4e Mon Sep 17 00:00:00 2001
From: Siju Varghese <varghese.siju@gmail.com>
Date: Wed, 29 Jan 2025 10:08:35 -0800
Subject: [PATCH] fix segment terminate early flag

---
 .../java/org/apache/solr/search/SolrIndexSearcher.java    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
index 1f301a1f828..2be1ac57419 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -332,14 +332,12 @@ private Collector buildAndRunCollectorChain(
       qr.setPartialResults(true);
       qr.setTerminatedEarly(true);
     } finally {
+      if (earlyTerminatingSortingCollector != null) {
+        qr.setSegmentTerminatedEarly(earlyTerminatingSortingCollector.terminatedEarly());
+      }
       if (cmd.isQueryCancellable()) {
         core.getCancellableQueryTracker().removeCancellableQuery(cmd.getQueryID());
       }
-      if (collector instanceof final EarlyTerminatingCollector earlyTerminatingCollector) {
-        if (earlyTerminatingCollector.isTerminatedEarly()) {
-          qr.setTerminatedEarly(true);
-        }
-      }
     }
     if (collector instanceof DelegatingCollector) {
       ((DelegatingCollector) collector).complete();