You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/08/31 17:47:07 UTC

[lucene-solr] branch reference_impl updated: @653 Switch to the rest of the stream stuff to use the root executor.

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/reference_impl by this push:
     new 80ff732  @653 Switch to the rest of the stream stuff to use the root executor.
80ff732 is described below

commit 80ff732b6cc632d907b780d6708a8f7727661a10
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Aug 31 12:45:27 2020 -0500

    @653 Switch to the rest of the stream stuff to use the root executor.
---
 .../java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java   | 2 +-
 .../src/java/org/apache/solr/client/solrj/io/stream/ExecutorStream.java | 2 +-
 .../org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java | 2 +-
 .../java/org/apache/solr/client/solrj/io/stream/ParallelListStream.java | 2 +-
 .../org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java  | 2 +-
 .../java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java
index 8f34c81..8c64605 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java
@@ -346,7 +346,7 @@ public class DeepRandomStream extends TupleStream implements Expressible {
   }
 
   private void openStreams() throws IOException {
-    final ExecutorService service = ParWork.getMyPerThreadExecutor();
+    final ExecutorService service = ParWork.getRootSharedExecutor();
     List<Future<TupleWrapper>> futures =
         solrStreams.stream().map(ss -> service.submit(new StreamOpener((SolrStream)ss, comp))).collect(Collectors.toList());
     try {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ExecutorStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ExecutorStream.java
index 50f3550..740ee75 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ExecutorStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ExecutorStream.java
@@ -132,7 +132,7 @@ public class ExecutorStream extends TupleStream implements Expressible {
   }
 
   public void open() throws IOException {
-    executorService = ParWork.getMyPerThreadExecutor();
+    executorService = ParWork.getRootSharedExecutor();
     stream.open();
   }
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java
index a5d0945..db9c0fe 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java
@@ -247,7 +247,7 @@ public class FeaturesSelectionStream extends TupleStream implements Expressible{
     }
 
     this.cloudSolrClient = this.cache.getCloudSolrClient(zkHost);
-    this.executorService = ParWork.getMyPerThreadExecutor();
+    this.executorService = ParWork.getRootSharedExecutor();
   }
 
   public List<TupleStream> children() {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ParallelListStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ParallelListStream.java
index 4d372c3..13dd9d9 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ParallelListStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ParallelListStream.java
@@ -133,7 +133,7 @@ public class ParallelListStream extends TupleStream implements Expressible {
   }
 
   private void openStreams() throws IOException {
-    ExecutorService service = ParWork.getMyPerThreadExecutor();
+    ExecutorService service = ParWork.getRootSharedExecutor();
     List<Future<StreamIndex>> futures = new ArrayList();
     int i=0;
     for (TupleStream tupleStream : streams) {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
index b15f14f..89659e3 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
@@ -232,7 +232,7 @@ public class SignificantTermsStream extends TupleStream implements Expressible{
       isCloseCache = false;
     }
 
-    this.executorService = ParWork.getMyPerThreadExecutor();
+    this.executorService = ParWork.getRootSharedExecutor();
   }
 
   public List<TupleStream> children() {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
index 5bea3cc..56d5894 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
@@ -327,7 +327,7 @@ public class TextLogitStream extends TupleStream implements Expressible {
     }
 
     this.cloudSolrClient = this.cache.getCloudSolrClient(zkHost);
-    this.executorService = ParWork.getMyPerThreadExecutor();
+    this.executorService = ParWork.getRootSharedExecutor();
   }
 
   public List<TupleStream> children() {