This is an automated email from the ASF dual-hosted git repository. brianloss pushed a commit to branch 1.10 in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1.10 by this push: new 7ad161e Use long instead of int for monitor scan rate (#1858) new e6bba1c Merge pull request #1860 from brianloss/1.10 7ad161e is described below commit 7ad161ed29bc7d15f40785eb7b4e6c668adc9d5d Author: Brian Loss <brianl...@apache.org> AuthorDate: Thu Jan 7 11:27:04 2021 -0500 Use long instead of int for monitor scan rate (#1858) --- .../main/java/org/apache/accumulo/monitor/Monitor.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java index 9d079c5..f33a451 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java @@ -154,10 +154,10 @@ public class Monitor { Collections.synchronizedList(new MaxList<Integer>(MAX_TIME_PERIOD)); private static final List<Pair<Long,Double>> lookupsOverTime = Collections.synchronizedList(new MaxList<Double>(MAX_TIME_PERIOD)); - private static final List<Pair<Long,Integer>> queryRateOverTime = - Collections.synchronizedList(new MaxList<Integer>(MAX_TIME_PERIOD)); - private static final List<Pair<Long,Integer>> scanRateOverTime = - Collections.synchronizedList(new MaxList<Integer>(MAX_TIME_PERIOD)); + private static final List<Pair<Long,Long>> queryRateOverTime = + Collections.synchronizedList(new MaxList<Long>(MAX_TIME_PERIOD)); + private static final List<Pair<Long,Long>> scanRateOverTime = + Collections.synchronizedList(new MaxList<Long>(MAX_TIME_PERIOD)); private static final List<Pair<Long,Double>> queryByteRateOverTime = Collections.synchronizedList(new MaxList<Double>(MAX_TIME_PERIOD)); private static final List<Pair<Long,Double>> indexCacheHitRateOverTime = @@ -381,10 +381,10 @@ public class Monitor { lookupsOverTime.add(new Pair<>(currentTime, lookupRateTracker.calculateRate())); - queryRateOverTime.add(new Pair<>(currentTime, (int) totalQueryRate)); + queryRateOverTime.add(new Pair<>(currentTime, (long) totalQueryRate)); queryByteRateOverTime.add(new Pair<>(currentTime, totalQueryByteRate)); - scanRateOverTime.add(new Pair<>(currentTime, (int) totalScanRate)); + scanRateOverTime.add(new Pair<>(currentTime, (long) totalScanRate)); calcCacheHitRate(indexCacheHitRateOverTime, currentTime, indexCacheHitTracker, indexCacheRequestTracker); @@ -839,13 +839,13 @@ public class Monitor { return lookupRateTracker.calculateRate(); } - public static List<Pair<Long,Integer>> getQueryRateOverTime() { + public static List<Pair<Long,Long>> getQueryRateOverTime() { synchronized (queryRateOverTime) { return new ArrayList<>(queryRateOverTime); } } - public static List<Pair<Long,Integer>> getScanRateOverTime() { + public static List<Pair<Long,Long>> getScanRateOverTime() { synchronized (scanRateOverTime) { return new ArrayList<>(scanRateOverTime); }