Create statistics package for related classes Change-Id: I2d6c7adb99a28cae9f920c7c27741824c9741cf1
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/MatchCache.java b/src/main/java/com/googlesource/gerrit/plugins/task/MatchCache.java index 08fa5ce..0be04ba 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/MatchCache.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/MatchCache.java
@@ -19,6 +19,8 @@ import com.google.gerrit.index.query.Matchable; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.server.query.change.ChangeData; +import com.googlesource.gerrit.plugins.task.statistics.HitBooleanTable; +import com.googlesource.gerrit.plugins.task.statistics.StopWatch; public class MatchCache { protected final HitBooleanTable<String, Change.Id> resultByChangeByQuery =
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/PredicateCache.java b/src/main/java/com/googlesource/gerrit/plugins/task/PredicateCache.java index 4aa6f57..e305d79 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/PredicateCache.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/PredicateCache.java
@@ -31,6 +31,8 @@ import com.google.gerrit.server.query.change.RegexProjectPredicate; import com.google.gerrit.server.query.change.RegexRefPredicate; import com.google.inject.Inject; +import com.googlesource.gerrit.plugins.task.statistics.HitHashMap; +import com.googlesource.gerrit.plugins.task.statistics.StopWatch; import java.util.Arrays; import java.util.HashSet; import java.util.Set;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/Preloader.java b/src/main/java/com/googlesource/gerrit/plugins/task/Preloader.java index e3a5700..2791d38 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/Preloader.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/Preloader.java
@@ -17,6 +17,8 @@ import com.google.inject.Inject; import com.googlesource.gerrit.plugins.task.TaskConfig.Task; import com.googlesource.gerrit.plugins.task.cli.PatchSetArgument; +import com.googlesource.gerrit.plugins.task.statistics.HitHashMap; +import com.googlesource.gerrit.plugins.task.statistics.StatisticsMap; import java.io.IOException; import java.lang.reflect.Field; import java.util.ArrayList;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java b/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java index ef860bb..ac65a0f 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java
@@ -39,6 +39,11 @@ import com.googlesource.gerrit.plugins.task.TaskConfig.TasksFactory; import com.googlesource.gerrit.plugins.task.cli.PatchSetArgument; import com.googlesource.gerrit.plugins.task.properties.Properties; +import com.googlesource.gerrit.plugins.task.statistics.HitHashMap; +import com.googlesource.gerrit.plugins.task.statistics.HitHashMapOfCollection; +import com.googlesource.gerrit.plugins.task.statistics.StatisticsMap; +import com.googlesource.gerrit.plugins.task.statistics.StopWatch; +import com.googlesource.gerrit.plugins.task.statistics.TracksStatistics; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/properties/CopyOnWrite.java b/src/main/java/com/googlesource/gerrit/plugins/task/properties/CopyOnWrite.java index 947dbf4..d1510fa 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/properties/CopyOnWrite.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/properties/CopyOnWrite.java
@@ -14,7 +14,7 @@ package com.googlesource.gerrit.plugins.task.properties; -import com.googlesource.gerrit.plugins.task.StopWatch; +import com.googlesource.gerrit.plugins.task.statistics.StopWatch; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Arrays;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/properties/Matcher.java b/src/main/java/com/googlesource/gerrit/plugins/task/properties/Matcher.java index 932f984..68151fb 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/properties/Matcher.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/properties/Matcher.java
@@ -14,7 +14,7 @@ package com.googlesource.gerrit.plugins.task.properties; -import com.googlesource.gerrit.plugins.task.StopWatch; +import com.googlesource.gerrit.plugins.task.statistics.StopWatch; import java.util.function.Consumer; /** A handcrafted properties Matcher which has an API similar to an RE Matcher, but is faster. */
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/properties/Properties.java b/src/main/java/com/googlesource/gerrit/plugins/task/properties/Properties.java index cb2d46e..9f82dba 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/properties/Properties.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/properties/Properties.java
@@ -17,11 +17,11 @@ import com.google.common.collect.ImmutableSet; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.server.query.change.ChangeData; -import com.googlesource.gerrit.plugins.task.StopWatch; import com.googlesource.gerrit.plugins.task.TaskConfig; import com.googlesource.gerrit.plugins.task.TaskConfig.NamesFactory; import com.googlesource.gerrit.plugins.task.TaskConfig.Task; import com.googlesource.gerrit.plugins.task.TaskTree; +import com.googlesource.gerrit.plugins.task.statistics.StopWatch; import java.util.Map; import java.util.function.Consumer; import java.util.function.Function;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/HitBooleanTable.java b/src/main/java/com/googlesource/gerrit/plugins/task/statistics/HitBooleanTable.java similarity index 96% rename from src/main/java/com/googlesource/gerrit/plugins/task/HitBooleanTable.java rename to src/main/java/com/googlesource/gerrit/plugins/task/statistics/HitBooleanTable.java index 8d9b9ec..480551c 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/HitBooleanTable.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/statistics/HitBooleanTable.java
@@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.googlesource.gerrit.plugins.task; +package com.googlesource.gerrit.plugins.task.statistics; import com.google.gerrit.common.BooleanTable; +import com.googlesource.gerrit.plugins.task.TopKeyMap; /** * A space efficient Table for Booleans. This Table takes advantage of the fact that the values
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/HitHashMap.java b/src/main/java/com/googlesource/gerrit/plugins/task/statistics/HitHashMap.java similarity index 97% rename from src/main/java/com/googlesource/gerrit/plugins/task/HitHashMap.java rename to src/main/java/com/googlesource/gerrit/plugins/task/statistics/HitHashMap.java index 6ea5a13..11ecaea 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/HitHashMap.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/statistics/HitHashMap.java
@@ -12,10 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.googlesource.gerrit.plugins.task; +package com.googlesource.gerrit.plugins.task.statistics; import static java.util.stream.Collectors.toList; +import com.googlesource.gerrit.plugins.task.TopKeyMap; import java.util.HashMap; import java.util.List; import java.util.Map;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/HitHashMapOfCollection.java b/src/main/java/com/googlesource/gerrit/plugins/task/statistics/HitHashMapOfCollection.java similarity index 97% rename from src/main/java/com/googlesource/gerrit/plugins/task/HitHashMapOfCollection.java rename to src/main/java/com/googlesource/gerrit/plugins/task/statistics/HitHashMapOfCollection.java index 67b2dde..31a9d61 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/HitHashMapOfCollection.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/statistics/HitHashMapOfCollection.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.googlesource.gerrit.plugins.task; +package com.googlesource.gerrit.plugins.task.statistics; import static java.util.stream.Collectors.toList;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/StatisticsMap.java b/src/main/java/com/googlesource/gerrit/plugins/task/statistics/StatisticsMap.java similarity index 93% rename from src/main/java/com/googlesource/gerrit/plugins/task/StatisticsMap.java rename to src/main/java/com/googlesource/gerrit/plugins/task/statistics/StatisticsMap.java index 9141fe9..5bca24d 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/StatisticsMap.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/statistics/StatisticsMap.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.googlesource.gerrit.plugins.task; +package com.googlesource.gerrit.plugins.task.statistics; import java.util.Map; import java.util.function.Function;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/StopWatch.java b/src/main/java/com/googlesource/gerrit/plugins/task/statistics/StopWatch.java similarity index 97% rename from src/main/java/com/googlesource/gerrit/plugins/task/StopWatch.java rename to src/main/java/com/googlesource/gerrit/plugins/task/statistics/StopWatch.java index 11fe588..52dd24d 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/StopWatch.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/statistics/StopWatch.java
@@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.googlesource.gerrit.plugins.task; +package com.googlesource.gerrit.plugins.task.statistics; import com.google.common.base.Stopwatch; +import com.googlesource.gerrit.plugins.task.SamTryWrapper; import java.util.concurrent.TimeUnit; import java.util.function.LongConsumer;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/TracksStatistics.java b/src/main/java/com/googlesource/gerrit/plugins/task/statistics/TracksStatistics.java similarity index 92% rename from src/main/java/com/googlesource/gerrit/plugins/task/TracksStatistics.java rename to src/main/java/com/googlesource/gerrit/plugins/task/statistics/TracksStatistics.java index 12d8722..a150600 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/TracksStatistics.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/statistics/TracksStatistics.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.googlesource.gerrit.plugins.task; +package com.googlesource.gerrit.plugins.task.statistics; public interface TracksStatistics { void initStatistics(int summaryCount);