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/07/27 17:35:27 UTC

[lucene-solr] branch reference_impl updated: @393 Make TimeTracker more efficient.

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 2f4f3a7  @393 Make TimeTracker more efficient.
2f4f3a7 is described below

commit 2f4f3a7ea0336ca97d55ba53582bc3e81b3b4848
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Jul 27 12:35:16 2020 -0500

    @393 Make TimeTracker more efficient.
---
 solr/solrj/src/java/org/apache/solr/common/TimeTracker.java    | 6 +++---
 solr/test-framework/src/java/org/apache/solr/SolrTestCase.java | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/solr/solrj/src/java/org/apache/solr/common/TimeTracker.java b/solr/solrj/src/java/org/apache/solr/common/TimeTracker.java
index bea8176..37455ac 100644
--- a/solr/solrj/src/java/org/apache/solr/common/TimeTracker.java
+++ b/solr/solrj/src/java/org/apache/solr/common/TimeTracker.java
@@ -31,7 +31,7 @@ public class TimeTracker {
   
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   
-  public static final Map<String,TimeTracker> CLOSE_TIMES = new ConcurrentHashMap<>();
+  public static final Map<String,TimeTracker> CLOSE_TIMES = new ConcurrentHashMap<>(2048, 0.75f, 6);
   
   private final long startTime;
 
@@ -39,11 +39,11 @@ public class TimeTracker {
 
   private volatile Object trackedObject;
   
-  private final List<TimeTracker> children = Collections.synchronizedList(new ArrayList<>());
+  private final List<TimeTracker> children = Collections.synchronizedList(new ArrayList<>(64));
 
   private final Class<? extends Object> clazz;
 
-  private final StringBuilder label = new StringBuilder();
+  private final StringBuilder label = new StringBuilder(2046);
   
   private final int depth;
   
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
index 13735ab..e564a72 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -376,12 +376,12 @@ public class SolrTestCase extends LuceneTestCase {
         synchronized (CoreContainer.class) {
           if (CoreContainer.solrCoreLoadExecutor != null) {
             CoreContainer.solrCoreLoadExecutor.shutdown();
-            ExecutorUtil.shutdownAndAwaitTermination(CoreContainer.solrCoreLoadExecutor);
+            ParWork.close(CoreContainer.solrCoreLoadExecutor);
             CoreContainer.solrCoreLoadExecutor = null;
           }
         }
       }
-      
+
       if (null != testExecutor) {
         ParWork.close(testExecutor);
         testExecutor = null;