simplify

Author: Vladimir Kotal

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

@@ -195,7 +195,6 @@ public final class Configuration {
     private int indexingParallelism;
     private int historyParallelism;
     private int historyRenamedParallelism;
-    private int repositorySearchParallelism;
     private boolean tagsEnabled;
     private int hitsPerPage;
     private int cachePages;
@@ -1146,14 +1145,6 @@ public void setHistoryRenamedParallelism(int value) {
         this.historyRenamedParallelism = value > 0 ? value : 0;
     }
 
-    public int getRepositorySearchParallelism() {
-        return repositorySearchParallelism;
-    }
-
-    public void setRepositorySearchParallelism(int value) {
-        this.repositorySearchParallelism = value > 0 ? value : 0;
-    }
-
     public boolean isTagsEnabled() {
         return this.tagsEnabled;
     }

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

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

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

@@ -478,7 +478,7 @@ private Collection<RepositoryInfo> addRepositories(File[] files,
      * @return collection of added repositories
      */
     public Collection<RepositoryInfo> addRepositories(File[] files) {
-        ExecutorService executor = env.getIndexerParallelizer().getRepositorySearchExecutor();
+        ExecutorService executor = env.getIndexerParallelizer().getFixedExecutor();
         List<Future<Collection<RepositoryInfo>>> futures = new ArrayList<>();
         for (File file: files) {
             futures.add(executor.submit(() -> addRepositories(new File[]{file},
@@ -494,8 +494,6 @@ public Collection<RepositoryInfo> addRepositories(File[] files) {
             }
         });
 
-        env.getIndexerParallelizer().bounceRepositorySearchExecutor();
-
         return repoList;
     }
 

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

@@ -746,10 +746,7 @@ public static String[] parseOptions(String[] argv) throws ParseException {
                     "The number of threads to use for index generation and repository scan.",
                     "By default the number of threads will be set to the number of available",
                     "CPUs. This influences the number of spawned ctags processes as well.").
-                    execute(threadCount -> {
-                        cfg.setIndexingParallelism((Integer) threadCount);
-                        cfg.setRepositorySearchParallelism((Integer) threadCount);
-                    });
+                    execute(threadCount -> cfg.setIndexingParallelism((Integer) threadCount));
 
             parser.on("-t", "--tabSize", "=number", Integer.class,
                 "Default tab size to use (number of spaces per tab character).")

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

@@ -62,7 +62,6 @@ public class IndexerParallelizer implements AutoCloseable {
     private LazilyInstantiate<ExecutorService> lzHistoryExecutor;
     private LazilyInstantiate<ExecutorService> lzHistoryRenamedExecutor;
     private LazilyInstantiate<ExecutorService> lzCtagsWatcherExecutor;
-    private LazilyInstantiate<ExecutorService> lzRepositorySearchExecutor;
 
     /**
      * Initializes a new instance using settings from the specified environment
@@ -86,7 +85,6 @@ public IndexerParallelizer(RuntimeEnvironment env) {
         createLazyHistoryExecutor();
         createLazyHistoryRenamedExecutor();
         createLazyCtagsWatcherExecutor();
-        createLazyRepositorySearchExecutor();
     }
 
     /**
@@ -131,13 +129,6 @@ public ExecutorService getCtagsWatcherExecutor() {
         return lzCtagsWatcherExecutor.get();
     }
 
-    /**
-     * @return the ExecutorService used for repository scan
-     */
-    public ExecutorService getRepositorySearchExecutor() {
-        return lzRepositorySearchExecutor.get();
-    }
-
     /**
      * Calls {@link #bounce()}, which prepares for -- but does not start -- new
      * pools.
@@ -170,7 +161,6 @@ public void bounce() {
         bounceHistoryExecutor();
         bounceHistoryRenamedExecutor();
         bounceCtagsWatcherExecutor();
-        bounceRepositorySearchExecutor();
     }
 
     private void bounceForkJoinPool() {
@@ -221,18 +211,6 @@ private void bounceCtagsWatcherExecutor() {
         }
     }
 
-    /**
-     * Shutdown the executor used for repository search.
-     * @see #bounce()
-     */
-    public void bounceRepositorySearchExecutor() {
-        if (lzRepositorySearchExecutor.isActive()) {
-            ExecutorService formerRepositorySearchExecutor = lzRepositorySearchExecutor.get();
-            createLazyRepositorySearchExecutor();
-            formerRepositorySearchExecutor.shutdown();
-        }
-    }
-
     private void createLazyForkJoinPool() {
         lzForkJoinPool = LazilyInstantiate.using(() ->
                 new ForkJoinPool(indexingParallelism));
@@ -268,11 +246,6 @@ private void createLazyHistoryRenamedExecutor() {
                 Executors.newFixedThreadPool(env.getHistoryRenamedParallelism()));
     }
 
-    private void createLazyRepositorySearchExecutor() {
-        lzRepositorySearchExecutor = LazilyInstantiate.using(() ->
-                Executors.newFixedThreadPool(env.getRepositorySearchParallelism()));
-    }
-
     private class CtagsObjectFactory implements ObjectFactory<Ctags> {
 
         public Ctags createNew() {