finish rename of executor for individual files

Author: Vladimir Kotal

opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/Configuration.java

@@ -193,7 +193,7 @@ public final class Configuration {
     private boolean indexVersionedFilesOnly;
     private int indexingParallelism;
     private int historyParallelism;
-    private int historyRenamedParallelism;
+    private int historyFileParallelism;
     private boolean tagsEnabled;
     private int hitsPerPage;
     private int cachePages;
@@ -1154,12 +1154,12 @@ public void setHistoryParallelism(int value) {
         this.historyParallelism = Math.max(value, 0);
     }
 
-    public int getHistoryRenamedParallelism() {
-        return historyRenamedParallelism;
+    public int getHistoryFileParallelism() {
+        return historyFileParallelism;
     }
 
-    public void setHistoryRenamedParallelism(int value) {
-        this.historyRenamedParallelism = Math.max(value, 0);
+    public void setHistoryFileParallelism(int value) {
+        this.historyFileParallelism = Math.max(value, 0);
     }
 
     public boolean isTagsEnabled() {

opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/RuntimeEnvironment.java

@@ -1118,12 +1118,12 @@ public int getHistoryParallelism() {
     }
 
     /**
-     * Gets the value of {@link Configuration#getHistoryRenamedParallelism()} -- or
+     * Gets the value of {@link Configuration#getHistoryFileParallelism()} -- or
      * if zero, then as a default gets the number of available processors.
      * @return a natural number >= 1
      */
-    public int getHistoryRenamedParallelism() {
-        int parallelism = syncReadConfiguration(Configuration::getHistoryRenamedParallelism);
+    public int getHistoryFileParallelism() {
+        int parallelism = syncReadConfiguration(Configuration::getHistoryFileParallelism);
         return parallelism < 1 ? Runtime.getRuntime().availableProcessors() :
                 parallelism;
     }

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

@@ -570,11 +570,11 @@ public static String[] parseOptions(String[] argv) throws ParseException {
                     "of threads will be set to the number of available CPUs. Assumes -H/--history.").execute(threadCount ->
                     cfg.setHistoryParallelism((Integer) threadCount));
 
-            parser.on("--historyRenamedThreads", "=number", Integer.class,
-                    "The number of threads to use for history cache generation when dealing with renamed files.",
+            parser.on("--historyFileThreads", "=number", Integer.class,
+                    "The number of threads to use for history cache generation when dealing with files.",
                     "By default the number of threads will be set to the number of available CPUs.",
                     "Assumes --renamedHistory=on").execute(threadCount ->
-                    cfg.setHistoryRenamedParallelism((Integer) threadCount));
+                    cfg.setHistoryFileParallelism((Integer) threadCount));
 
             parser.on("-I", "--include", "=pattern",
                     "Only files matching this pattern will be examined. Pattern supports",

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

@@ -82,7 +82,7 @@ public IndexerParallelizer(RuntimeEnvironment env) {
         createLazyCtagsPool();
         createLazyFixedExecutor();
         createLazyHistoryExecutor();
-        createLazyHistoryRenamedExecutor();
+        createLazyHistoryFileExecutor();
         createLazyCtagsWatcherExecutor();
     }
 
@@ -197,7 +197,7 @@ private void bounceHistoryExecutor() {
     private void bounceHistoryRenamedExecutor() {
         if (lzHistoryFileExecutor.isActive()) {
             ExecutorService formerHistoryRenamedExecutor = lzHistoryFileExecutor.get();
-            createLazyHistoryRenamedExecutor();
+            createLazyHistoryFileExecutor();
             formerHistoryRenamedExecutor.shutdown();
         }
     }
@@ -240,9 +240,9 @@ private void createLazyHistoryExecutor() {
                 Executors.newFixedThreadPool(env.getHistoryParallelism()));
     }
 
-    private void createLazyHistoryRenamedExecutor() {
+    private void createLazyHistoryFileExecutor() {
         lzHistoryFileExecutor = LazilyInstantiate.using(() ->
-                Executors.newFixedThreadPool(env.getHistoryRenamedParallelism()));
+                Executors.newFixedThreadPool(env.getHistoryFileParallelism()));
     }
 
     private class CtagsObjectFactory implements ObjectFactory<Ctags> {