tidy

cowpaths · Oct 4, 2024 · 088bda0 · 088bda0
1 parent c9dcfb0
commit 088bda0
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 33 deletions.
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -178,7 +178,8 @@ public class CoreContainer {
 
   final SolrCores solrCores;
 
-  private final ExecutorService storedFieldsExecutor = ExecutorUtil.newMDCAwareCachedThreadPool("storedFieldsExecutor");
+  private final ExecutorService storedFieldsExecutor =
+      ExecutorUtil.newMDCAwareCachedThreadPool("storedFieldsExecutor");
 
   public void storedFieldsExecute(Callable<Void> callable) throws IOException {
     Future<Void> future = storedFieldsExecutor.submit(callable);

diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
@@ -235,10 +235,24 @@ public void process(ResponseBuilder rb) throws IOException {
 
     try {
 
-      req.getCoreContainer().storedFieldsExecute(() -> {
-        extracted(rb, reqIds, fieldType, params, searcherInfo, ulog, mustUseRealtimeSearcher, core, transformer, rsp, req, docList);
-        return null;
-      });
+      req.getCoreContainer()
+          .storedFieldsExecute(
+              () -> {
+                extracted(
+                    rb,
+                    reqIds,
+                    fieldType,
+                    params,
+                    searcherInfo,
+                    ulog,
+                    mustUseRealtimeSearcher,
+                    core,
+                    transformer,
+                    rsp,
+                    req,
+                    docList);
+                return null;
+              });
 
     } finally {
       searcherInfo.clear();
@@ -247,7 +261,20 @@ public void process(ResponseBuilder rb) throws IOException {
     addDocListToResponse(rb, docList);
   }
 
-  private static void extracted(ResponseBuilder rb, IdsRequested reqIds, FieldType fieldType, SolrParams params, SearcherInfo searcherInfo, UpdateLog ulog, boolean mustUseRealtimeSearcher, SolrCore core, DocTransformer transformer, SolrQueryResponse rsp, SolrQueryRequest req, SolrDocumentList docList) throws IOException {
+  private static void extracted(
+      ResponseBuilder rb,
+      IdsRequested reqIds,
+      FieldType fieldType,
+      SolrParams params,
+      SearcherInfo searcherInfo,
+      UpdateLog ulog,
+      boolean mustUseRealtimeSearcher,
+      SolrCore core,
+      DocTransformer transformer,
+      SolrQueryResponse rsp,
+      SolrQueryRequest req,
+      SolrDocumentList docList)
+      throws IOException {
     // this is initialized & set on the context *after* any searcher (re-)opening
     ResultContext resultContext = null;
     boolean opennedRealtimeSearcher = false;
@@ -320,8 +347,7 @@ private static void extracted(ResponseBuilder rb, IdsRequested reqIds, FieldType
             case UpdateLog.DELETE:
               break;
             default:
-              throw new SolrException(
-                  ErrorCode.SERVER_ERROR, "Unknown Operation! " + oper);
+              throw new SolrException(ErrorCode.SERVER_ERROR, "Unknown Operation! " + oper);
           }
           if (o != null) continue;
         }
@@ -363,8 +389,7 @@ private static void extracted(ResponseBuilder rb, IdsRequested reqIds, FieldType
           searcherInfo.getSearcher().doc(docid, rsp.getReturnFields().getLuceneFieldNames());
       SolrDocument doc = toSolrDoc(luceneDocument, core.getLatestSchema());
       SolrDocumentFetcher docFetcher = searcherInfo.getSearcher().getDocFetcher();
-      docFetcher.decorateDocValueFields(
-          doc, docid, docFetcher.getNonStoredDVs(true), reuseDvIters);
+      docFetcher.decorateDocValueFields(doc, docid, docFetcher.getNonStoredDVs(true), reuseDvIters);
       if (null != transformer) {
         if (null == resultContext) {
           // either first pass, or we've re-opened searcher - either way now we setContext

diff --git a/solr/core/src/java/org/apache/solr/response/QueryResponseWriterUtil.java b/solr/core/src/java/org/apache/solr/response/QueryResponseWriterUtil.java
@@ -49,23 +49,28 @@ public static void writeQueryResponse(
       String contentType)
       throws IOException {
 
-    solrRequest.getCoreContainer().storedFieldsExecute(() -> {
-      if (responseWriter instanceof JacksonJsonWriter) {
-        JacksonJsonWriter binWriter = (JacksonJsonWriter) responseWriter;
-        BufferedOutputStream bos = new BufferedOutputStream(new NonFlushingStream(outputStream));
-        binWriter.write(bos, solrRequest, solrResponse);
-        bos.flush();
-      } else if (responseWriter instanceof BinaryQueryResponseWriter) {
-        BinaryQueryResponseWriter binWriter = (BinaryQueryResponseWriter) responseWriter;
-        binWriter.write(outputStream, solrRequest, solrResponse);
-      } else {
-        OutputStream out = new NonFlushingStream(outputStream);
-        Writer writer = buildWriter(out, ContentStreamBase.getCharsetFromContentType(contentType));
-        responseWriter.write(writer, solrRequest, solrResponse);
-        writer.flush();
-      }
-      return null;
-    });
+    solrRequest
+        .getCoreContainer()
+        .storedFieldsExecute(
+            () -> {
+              if (responseWriter instanceof JacksonJsonWriter) {
+                JacksonJsonWriter binWriter = (JacksonJsonWriter) responseWriter;
+                BufferedOutputStream bos =
+                    new BufferedOutputStream(new NonFlushingStream(outputStream));
+                binWriter.write(bos, solrRequest, solrResponse);
+                bos.flush();
+              } else if (responseWriter instanceof BinaryQueryResponseWriter) {
+                BinaryQueryResponseWriter binWriter = (BinaryQueryResponseWriter) responseWriter;
+                binWriter.write(outputStream, solrRequest, solrResponse);
+              } else {
+                OutputStream out = new NonFlushingStream(outputStream);
+                Writer writer =
+                    buildWriter(out, ContentStreamBase.getCharsetFromContentType(contentType));
+                responseWriter.write(writer, solrRequest, solrResponse);
+                writer.flush();
+              }
+              return null;
+            });
   }
 
   private static Writer buildWriter(OutputStream outputStream, String charset)

diff --git a/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java b/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
@@ -252,12 +252,14 @@ public static void optimizePreFetchDocs(
       // get documents
       DocIterator iter = docs.iterator();
       Set<String> fieldFilterF = fieldFilter;
-      req.getCoreContainer().storedFieldsExecute(() -> {
-        for (int i = 0; i < docs.size(); i++) {
-          searcher.doc(iter.nextDoc(), fieldFilterF);
-        }
-        return null;
-      });
+      req.getCoreContainer()
+          .storedFieldsExecute(
+              () -> {
+                for (int i = 0; i < docs.size(); i++) {
+                  searcher.doc(iter.nextDoc(), fieldFilterF);
+                }
+                return null;
+              });
     }
   }