diff options
| author | Duarte Meneses <duarte.meneses@sonarsource.com> | 2015-09-09 16:48:49 +0200 |
|---|---|---|
| committer | Duarte Meneses <duarte.meneses@sonarsource.com> | 2015-09-14 17:29:40 +0200 |
| commit | 069f75fe8558dbea2c7194465f84c5b025bdd672 (patch) | |
| tree | f6a6e1b293276a9f04836e3bf539190798f17d04 /sonar-batch | |
| parent | 29d4206d4d69d5c36e8153bf1f0f52d47418799c (diff) | |
| download | sonarqube-069f75fe8558dbea2c7194465f84c5b025bdd672.tar.gz sonarqube-069f75fe8558dbea2c7194465f84c5b025bdd672.zip | |
improve batch logging and performance
Diffstat (limited to 'sonar-batch')
| -rw-r--r-- | sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java | 5 | ||||
| -rw-r--r-- | sonar-batch/src/main/java/org/sonar/batch/scan/measure/DefaultMetricFinder.java | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java index 6b06a999a32..90bada354ec 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java @@ -19,6 +19,8 @@ */ package org.sonar.batch.scan.filesystem; +import com.google.common.util.concurrent.ThreadFactoryBuilder; + import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.FileFilterUtils; import org.apache.commons.io.filefilter.HiddenFileFilter; @@ -89,7 +91,8 @@ public class FileIndexer { Progress progress = new Progress(); InputFileBuilder inputFileBuilder = inputFileBuilderFactory.create(fileSystem); - executorService = Executors.newFixedThreadPool(Math.max(1, Runtime.getRuntime().availableProcessors() - 1)); + int threads = Math.max(1, Runtime.getRuntime().availableProcessors() - 1); + executorService = Executors.newFixedThreadPool(threads, new ThreadFactoryBuilder().setNameFormat("FileIndexer-%d").build()); tasks = new ArrayList<>(); indexFiles(fileSystem, progress, inputFileBuilder, fileSystem.sources(), InputFile.Type.MAIN); indexFiles(fileSystem, progress, inputFileBuilder, fileSystem.tests(), InputFile.Type.TEST); diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/measure/DefaultMetricFinder.java b/sonar-batch/src/main/java/org/sonar/batch/scan/measure/DefaultMetricFinder.java index 5d2176b6b18..daff30e8982 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/measure/DefaultMetricFinder.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/measure/DefaultMetricFinder.java @@ -20,19 +20,19 @@ package org.sonar.batch.scan.measure; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import org.sonar.api.batch.measure.Metric; import org.sonar.api.batch.measure.MetricFinder; import org.sonar.api.measures.Metric.ValueType; import org.sonar.batch.protocol.input.GlobalRepositories; import java.util.Collection; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; public class DefaultMetricFinder implements MetricFinder { - private Map<String, Metric> metricsByKey = Maps.newLinkedHashMap(); + private Map<String, Metric> metricsByKey = new LinkedHashMap<>(); public DefaultMetricFinder(GlobalRepositories globalReferentials) { for (org.sonar.batch.protocol.input.Metric metric : globalReferentials.metrics()) { |