[lucene-solr] branch reference_impl updated: @635 Use the root executor.

[ma...@apache.org]

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 5e96805  @635 Use the root executor.
5e96805 is described below

commit 5e9680546fb05b5df5cf2fb98f498a913ef7ca8e
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Aug 30 11:46:37 2020 -0500

    @635 Use the root executor.
---
 .../org/apache/solr/client/solrj/io/graph/GatherNodesStream.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java
index 7e42182..dae7f8b 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java
@@ -519,7 +519,7 @@ public class GatherNodesStream extends TupleStream implements Expressible {
 
       ExecutorService threadPool = null;
       try {
-        threadPool = ParWork.getExecutor();
+        threadPool = ParWork.getEXEC();
 
         Map<String, Node> roots = new HashMap();
 
@@ -543,7 +543,7 @@ public class GatherNodesStream extends TupleStream implements Expressible {
             if(!roots.containsKey(key)) {
               Node node = new Node(value, trackTraversal);
               if (metrics != null) {
-                List<Metric> _metrics = new ArrayList();
+                List<Metric> _metrics = new ArrayList(metrics.size());
                 for (Metric metric : metrics) {
                   _metrics.add(metric.newInstance());
                 }
@@ -606,6 +606,7 @@ public class GatherNodesStream extends TupleStream implements Expressible {
         traversal.addLevel(level, collection, gather);
         out = traversal.iterator();
       } catch(Exception e) {
+        ParWork.propegateInterrupt(e);
         throw new RuntimeException(e);
       }
     }