fix segment terminate early flag

apache · Jan 29, 2025 · 87f146d · 87f146d
1 parent 4ad621e
commit 87f146d
Showing 1 changed file with 3 additions and 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
@@ -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();