rename executor

Author: Vladimir Kotal

opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileHistoryCache.java

@@ -521,7 +521,7 @@ public void storeRenamed(Set<String> renamedFiles, Repository repository, String
         final CountDownLatch latch = new CountDownLatch(renamedFiles.size());
         AtomicInteger renamedFileHistoryCount = new AtomicInteger();
         for (final String file : renamedFiles) {
-            env.getIndexerParallelizer().getHistoryRenamedExecutor().submit(() -> {
+            env.getIndexerParallelizer().getHistoryFileExecutor().submit(() -> {
                 try {
                     doRenamedFileHistory(file,
                             new File(env.getSourceRootPath() + file),

opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexerParallelizer.java

@@ -59,7 +59,7 @@ public class IndexerParallelizer implements AutoCloseable {
     private LazilyInstantiate<ObjectPool<Ctags>> lzCtagsPool;
     private LazilyInstantiate<ExecutorService> lzFixedExecutor;
     private LazilyInstantiate<ExecutorService> lzHistoryExecutor;
-    private LazilyInstantiate<ExecutorService> lzHistoryRenamedExecutor;
+    private LazilyInstantiate<ExecutorService> lzHistoryFileExecutor;
     private LazilyInstantiate<ExecutorService> lzCtagsWatcherExecutor;
 
     /**
@@ -108,17 +108,17 @@ public ObjectPool<Ctags> getCtagsPool() {
     }
 
     /**
-     * @return the ExecutorService used for history parallelism
+     * @return the ExecutorService used for history parallelism (repository level)
      */
     public ExecutorService getHistoryExecutor() {
         return lzHistoryExecutor.get();
     }
 
     /**
-     * @return the ExecutorService used for history-renamed parallelism
+     * @return the ExecutorService used for history parallelism (file level)
      */
-    public ExecutorService getHistoryRenamedExecutor() {
-        return lzHistoryRenamedExecutor.get();
+    public ExecutorService getHistoryFileExecutor() {
+        return lzHistoryFileExecutor.get();
     }
 
     /**
@@ -195,8 +195,8 @@ private void bounceHistoryExecutor() {
     }
 
     private void bounceHistoryRenamedExecutor() {
-        if (lzHistoryRenamedExecutor.isActive()) {
-            ExecutorService formerHistoryRenamedExecutor = lzHistoryRenamedExecutor.get();
+        if (lzHistoryFileExecutor.isActive()) {
+            ExecutorService formerHistoryRenamedExecutor = lzHistoryFileExecutor.get();
             createLazyHistoryRenamedExecutor();
             formerHistoryRenamedExecutor.shutdown();
         }
@@ -241,7 +241,7 @@ private void createLazyHistoryExecutor() {
     }
 
     private void createLazyHistoryRenamedExecutor() {
-        lzHistoryRenamedExecutor = LazilyInstantiate.using(() ->
+        lzHistoryFileExecutor = LazilyInstantiate.using(() ->
                 Executors.newFixedThreadPool(env.getHistoryRenamedParallelism()));
     }