Repository: ignite Updated Branches: refs/heads/master 5764960e8 -> 16d23700d
IGNITE-6422 Visor CMD: Fixed cache statistics output. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/16d23700 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/16d23700 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/16d23700 Branch: refs/heads/master Commit: 16d23700d25961aae8d75e11c55349fab78f2a79 Parents: 5764960 Author: vsisko <[email protected]> Authored: Mon Oct 2 23:08:40 2017 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Mon Oct 2 23:08:40 2017 +0700 ---------------------------------------------------------------------- .../cache/VisorCacheAggregatedMetrics.java | 24 ++++++------- .../commands/cache/VisorCacheCommand.scala | 38 ++++++++++---------- 2 files changed, 31 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/16d23700/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java index ccefa67..a0258cc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAggregatedMetrics.java @@ -208,35 +208,35 @@ public class VisorCacheAggregatedMetrics extends VisorDataTransferObject { /** * @param metric Metrics to process. - * @return Off heap entries count. + * @return Off heap primary entries count. */ - private long getOffHeapEntriesCount(VisorCacheMetrics metric) { - return metric.getOffHeapEntriesCount(); + private long getOffHeapPrimaryEntriesCount(VisorCacheMetrics metric) { + return metric.getOffHeapPrimaryEntriesCount(); } /** - * @return Minimum number of elements in off heap. + * @return Minimum number of primary elements in off heap. */ - public long getMinimumOffHeapSize() { + public long getMinimumOffHeapPrimarySize() { if (minOffHeapSize == null) { minOffHeapSize = Long.MAX_VALUE; for (VisorCacheMetrics metric : metrics.values()) - minOffHeapSize = Math.min(minOffHeapSize, getOffHeapEntriesCount(metric)); + minOffHeapSize = Math.min(minOffHeapSize, getOffHeapPrimaryEntriesCount(metric)); } return minOffHeapSize; } /** - * @return Average number of elements in off heap. + * @return Average number of primary elements in off heap. */ - public double getAverageOffHeapSize() { + public double getAverageOffHeapPrimarySize() { if (avgOffHeapSize == null) { avgOffHeapSize = 0.0d; for (VisorCacheMetrics metric : metrics.values()) - avgOffHeapSize += getOffHeapEntriesCount(metric); + avgOffHeapSize += getOffHeapPrimaryEntriesCount(metric); avgOffHeapSize /= metrics.size(); } @@ -245,14 +245,14 @@ public class VisorCacheAggregatedMetrics extends VisorDataTransferObject { } /** - * @return Maximum number of elements in off heap in the cache. + * @return Maximum number of primary elements in off heap. */ - public long getMaximumOffHeapSize() { + public long getMaximumOffHeapPrimarySize() { if (maxOffHeapSize == null) { maxOffHeapSize = Long.MIN_VALUE; for (VisorCacheMetrics metric : metrics.values()) - maxOffHeapSize = Math.max(maxOffHeapSize, getOffHeapEntriesCount(metric)); + maxOffHeapSize = Math.max(maxOffHeapSize, getOffHeapPrimaryEntriesCount(metric)); } return maxOffHeapSize; http://git-wip-us.apache.org/repos/asf/ignite/blob/16d23700/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala index f754275..dde3289 100755 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala @@ -328,12 +328,12 @@ class VisorCacheCommand { ad.getMode, ad.getNodes.size(), ( - "min: " + (ad.getMinimumHeapSize + ad.getMinimumOffHeapSize) + - " (" + ad.getMinimumHeapSize + " / " + ad.getMinimumOffHeapSize + ")", - "avg: " + formatDouble(ad.getAverageHeapSize + ad.getAverageOffHeapSize) + - " (" + formatDouble(ad.getAverageHeapSize) + " / " + formatDouble(ad.getAverageOffHeapSize) + ")", - "max: " + (ad.getMaximumHeapSize + ad.getMaximumOffHeapSize) + - " (" + ad.getMaximumHeapSize + " / " + ad.getMaximumOffHeapSize + ")" + "min: " + (ad.getMinimumHeapSize + ad.getMinimumOffHeapPrimarySize) + + " (" + ad.getMinimumHeapSize + " / " + ad.getMinimumOffHeapPrimarySize + ")", + "avg: " + formatDouble(ad.getAverageHeapSize + ad.getAverageOffHeapPrimarySize) + + " (" + formatDouble(ad.getAverageHeapSize) + " / " + formatDouble(ad.getAverageOffHeapPrimarySize) + ")", + "max: " + (ad.getMaximumHeapSize + ad.getMaximumOffHeapPrimarySize) + + " (" + ad.getMaximumHeapSize + " / " + ad.getMaximumOffHeapPrimarySize + ")" ), ( "min: " + ad.getMinimumHits, @@ -385,13 +385,13 @@ class VisorCacheCommand { csT += ("Name(@)", cacheNameVar) csT += ("Nodes", m.size()) - csT += ("Total size Min/Avg/Max", (ad.getMinimumHeapSize + ad.getMinimumOffHeapSize) + " / " + - formatDouble(ad.getAverageHeapSize + ad.getAverageOffHeapSize) + " / " + - (ad.getMaximumHeapSize + ad.getMaximumOffHeapSize)) + csT += ("Total size Min/Avg/Max", (ad.getMinimumHeapSize + ad.getMinimumOffHeapPrimarySize) + " / " + + formatDouble(ad.getAverageHeapSize + ad.getAverageOffHeapPrimarySize) + " / " + + (ad.getMaximumHeapSize + ad.getMaximumOffHeapPrimarySize)) csT += (" Heap size Min/Avg/Max", ad.getMinimumHeapSize + " / " + formatDouble(ad.getAverageHeapSize) + " / " + ad.getMaximumHeapSize) - csT += (" Off-heap size Min/Avg/Max", ad.getMinimumOffHeapSize + " / " + - formatDouble(ad.getAverageOffHeapSize) + " / " + ad.getMaximumOffHeapSize) + csT += (" Off-heap size Min/Avg/Max", ad.getMinimumOffHeapPrimarySize + " / " + + formatDouble(ad.getAverageOffHeapPrimarySize) + " / " + ad.getMaximumOffHeapPrimarySize) val ciT = VisorTextTable() @@ -408,9 +408,9 @@ class VisorCacheCommand { formatDouble(nm.getCurrentCpuLoad * 100d) + " %", X.timeSpan2HMSM(nm.getUpTime), ( - "Total: " + (cm.getHeapEntriesCount + cm.getOffHeapEntriesCount()), + "Total: " + (cm.getHeapEntriesCount + cm.getOffHeapPrimaryEntriesCount), " Heap: " + cm.getHeapEntriesCount, - " Off-Heap: " + cm.getOffHeapEntriesCount(), + " Off-Heap: " + cm.getOffHeapPrimaryEntriesCount, " Off-Heap Memory: " + formatMemory(cm.getOffHeapAllocatedSize) ), ( @@ -644,12 +644,12 @@ class VisorCacheCommand { mkCacheName(ad.getName), ad.getMode, ( - "min: " + (ad.getMinimumHeapSize + ad.getMinimumOffHeapSize) + - " (" + ad.getMinimumHeapSize + " / " + ad.getMinimumOffHeapSize + ")", - "avg: " + formatDouble(ad.getAverageHeapSize + ad.getAverageOffHeapSize) + - " (" + formatDouble(ad.getAverageHeapSize) + " / " + formatDouble(ad.getAverageOffHeapSize) + ")", - "max: " + (ad.getMaximumHeapSize + ad.getMaximumOffHeapSize) + - " (" + ad.getMaximumHeapSize + " / " + ad.getMaximumOffHeapSize + ")" + "min: " + (ad.getMinimumHeapSize + ad.getMinimumOffHeapPrimarySize) + + " (" + ad.getMinimumHeapSize + " / " + ad.getMinimumOffHeapPrimarySize + ")", + "avg: " + formatDouble(ad.getAverageHeapSize + ad.getAverageOffHeapPrimarySize) + + " (" + formatDouble(ad.getAverageHeapSize) + " / " + formatDouble(ad.getAverageOffHeapPrimarySize) + ")", + "max: " + (ad.getMaximumHeapSize + ad.getMaximumOffHeapPrimarySize) + + " (" + ad.getMaximumHeapSize + " / " + ad.getMaximumOffHeapPrimarySize + ")" )) })
