More cleanup

Signed-off-by: Atri Sharma <atrisharma@Atris-Mac-Studio.local>

Author: Atri Sharma

server/src/main/java/org/opensearch/action/search/SearchProgressListener.java

@@ -110,25 +110,6 @@ protected void onQueryFailure(int shardIndex, SearchShardTarget shardTarget, Exc
      */
     protected void onPartialReduce(List<SearchShard> shards, TotalHits totalHits, InternalAggregations aggs, int reducePhase) {}
 
-    /**
-     * Executed when a partial reduce with TopDocs is created for streaming search.
-     *
-     * @param shards The list of shards that are part of this reduce.
-     * @param totalHits The total number of hits in this reduce.
-     * @param topDocs The partial TopDocs result (may be null if no docs).
-     * @param aggs The partial result for aggregations.
-     * @param reducePhase The version number for this reduce.
-     */
-    protected void onPartialReduceWithTopDocs(
-        List<SearchShard> shards,
-        TotalHits totalHits,
-        org.apache.lucene.search.TopDocs topDocs,
-        InternalAggregations aggs,
-        int reducePhase
-    ) {
-        // Default implementation delegates to the original method for backward compatibility
-        onPartialReduce(shards, totalHits, aggs, reducePhase);
-    }
 
     /**
      * Executed once when the final reduce is created.
@@ -206,19 +187,6 @@ final void notifyPartialReduce(List<SearchShard> shards, TotalHits totalHits, In
         }
     }
 
-    final void notifyPartialReduceWithTopDocs(
-        List<SearchShard> shards,
-        TotalHits totalHits,
-        org.apache.lucene.search.TopDocs topDocs,
-        InternalAggregations aggs,
-        int reducePhase
-    ) {
-        try {
-            onPartialReduceWithTopDocs(shards, totalHits, topDocs, aggs, reducePhase);
-        } catch (Exception e) {
-            logger.warn(() -> new ParameterizedMessage("Failed to execute progress listener on partial reduce with TopDocs"), e);
-        }
-    }
 
     protected final void notifyFinalReduce(List<SearchShard> shards, TotalHits totalHits, InternalAggregations aggs, int reducePhase) {
         try {

server/src/main/java/org/opensearch/action/search/SearchRequest.java

@@ -128,8 +128,9 @@ public class SearchRequest extends ActionRequest implements IndicesRequest.Repla
 
     private Boolean phaseTook = null;
 
-    private boolean streamingScoring = false;
-    private String streamingSearchMode = null; // Will use StreamingSearchMode.NO_SCORING if null
+
+    // Null means no explicit streaming mode on the request.
+    private String streamingSearchMode = null;
 
     public SearchRequest() {
         this.localClusterAlias = null;
@@ -149,7 +150,7 @@ public SearchRequest(SearchRequest searchRequest) {
             searchRequest.finalReduce
         );
         // Preserve streaming fields when cloning
-        this.streamingScoring = searchRequest.streamingScoring;
+
         this.streamingSearchMode = searchRequest.streamingSearchMode;
     }
 
@@ -240,7 +241,7 @@ private SearchRequest(
         this.cancelAfterTimeInterval = searchRequest.cancelAfterTimeInterval;
         this.phaseTook = searchRequest.phaseTook;
         // Preserve streaming fields for forked/sub-requests
-        this.streamingScoring = searchRequest.streamingScoring;
+
         this.streamingSearchMode = searchRequest.streamingSearchMode;
     }
 
@@ -291,10 +292,8 @@ public SearchRequest(StreamInput in) throws IOException {
         }
         // Read streaming fields - gated on version for BWC
         if (in.getVersion().onOrAfter(Version.V_3_3_0)) {
-            streamingScoring = in.readBoolean();
             streamingSearchMode = in.readOptionalString();
         } else {
-            streamingScoring = false;
             streamingSearchMode = null;
         }
     }
@@ -333,7 +332,6 @@ public void writeTo(StreamOutput out) throws IOException {
         }
         // Write streaming fields - gated on version for BWC
         if (out.getVersion().onOrAfter(Version.V_3_3_0)) {
-            out.writeBoolean(streamingScoring);
             out.writeOptionalString(streamingSearchMode);
         }
     }
@@ -717,20 +715,6 @@ public void setPhaseTook(Boolean phaseTook) {
         this.phaseTook = phaseTook;
     }
 
-    /**
-     * Enable streaming scoring for this search request.
-     */
-    public void setStreamingScoring(boolean streamingScoring) {
-        this.streamingScoring = streamingScoring;
-    }
-
-    /**
-     * Check if streaming scoring is enabled for this search request.
-     */
-    public boolean isStreamingScoring() {
-        return streamingScoring;
-    }
-
     /**
      * Sets the streaming search mode for this request.
      * @param mode The streaming search mode to use
@@ -858,7 +842,8 @@ public boolean equals(Object o) {
             && ccsMinimizeRoundtrips == that.ccsMinimizeRoundtrips
             && Objects.equals(cancelAfterTimeInterval, that.cancelAfterTimeInterval)
             && Objects.equals(pipeline, that.pipeline)
-            && Objects.equals(phaseTook, that.phaseTook);
+            && Objects.equals(phaseTook, that.phaseTook)
+            && Objects.equals(streamingSearchMode, that.streamingSearchMode);
     }
 
     @Override
@@ -880,7 +865,8 @@ public int hashCode() {
             absoluteStartMillis,
             ccsMinimizeRoundtrips,
             cancelAfterTimeInterval,
-            phaseTook
+            phaseTook,
+            streamingSearchMode
         );
     }
 

server/src/main/java/org/opensearch/action/search/SearchResponse.java

@@ -355,7 +355,6 @@ public XContentBuilder innerToXContent(XContentBuilder builder, Params params) t
         if (getNumReducePhases() != 1) {
             builder.field(NUM_REDUCE_PHASES.getPreferredName(), getNumReducePhases());
         }
-
         RestActions.buildBroadcastShardsHeader(
             builder,
             params,