revert debug change + dry

Author: original-brownbear

server/src/main/java/org/elasticsearch/common/lucene/Lucene.java

@@ -391,7 +391,7 @@ public static ScoreDoc readScoreDoc(StreamInput in) throws IOException {
     }
 
     public static ScoreDoc readScoreDocWithShardIndex(StreamInput in) throws IOException {
-        var res = new ScoreDoc(in.readVInt(), in.readFloat());
+        var res = readScoreDoc(in);
         res.shardIndex = in.readVInt();
         return res;
     }

server/src/main/java/org/elasticsearch/search/SearchService.java

@@ -322,8 +322,6 @@ public class SearchService extends AbstractLifecycleComponent implements IndexEv
 
     private final Tracer tracer;
 
-    private final CircuitBreaker circuitBreaker;
-
     public SearchService(
         ClusterService clusterService,
         IndicesService indicesService,
@@ -342,8 +340,11 @@ public SearchService(
         this.scriptService = scriptService;
         this.bigArrays = bigArrays;
         this.fetchPhase = fetchPhase;
-        this.circuitBreaker = circuitBreakerService.getBreaker(CircuitBreaker.REQUEST);
-        this.multiBucketConsumerService = new MultiBucketConsumerService(clusterService, settings, circuitBreaker);
+        this.multiBucketConsumerService = new MultiBucketConsumerService(
+            clusterService,
+            settings,
+            circuitBreakerService.getBreaker(CircuitBreaker.REQUEST)
+        );
         this.executorSelector = executorSelector;
         this.tracer = tracer;
 
@@ -390,10 +391,6 @@ public SearchService(
             .addSettingsUpdateConsumer(QUERY_PHASE_PARALLEL_COLLECTION_ENABLED, this::setEnableQueryPhaseParallelCollection);
     }
 
-    public CircuitBreaker circuitBreaker() {
-        return circuitBreaker;
-    }
-
     private void setEnableSearchWorkerThreads(boolean enableSearchWorkerThreads) {
         if (enableSearchWorkerThreads) {
             searchExecutor = threadPool.executor(Names.SEARCH);