You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/05 14:24:12 UTC
[06/50] incubator-ignite git commit: # IGNITE-839 Fixed cache metrics.
# IGNITE-839 Fixed cache metrics.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/db8333d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/db8333d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/db8333d7
Branch: refs/heads/ignite-834
Commit: db8333d77d68669edc203de8e69ad49ecc62f4c0
Parents: a7599bf
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Apr 29 17:42:43 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Apr 29 17:42:43 2015 +0700
----------------------------------------------------------------------
.../internal/visor/cache/VisorCacheMetrics.java | 53 +++++++-------------
1 file changed, 19 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db8333d7/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
index c05b9e0..30be424 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
@@ -29,7 +29,7 @@ import java.io.*;
*/
public class VisorCacheMetrics implements Serializable {
/** */
- private static final int MICROSECONDS_IN_SECOND = 1_000_000;
+ private static final float MICROSECONDS_IN_SECOND = 1_000_000;
/** */
private static final long serialVersionUID = 0L;
@@ -94,14 +94,11 @@ public class VisorCacheMetrics implements Serializable {
/** Reads per second. */
private int readsPerSec;
- /** Writes per second. */
- private int writesPerSec;
+ /** Puts per second. */
+ private int putsPerSec;
- /** Hits per second. */
- private int hitsPerSec;
-
- /** Misses per second. */
- private int missesPerSec;
+ /** Removes per second. */
+ private int removalsPerSec;
/** Commits per second. */
private int commitsPerSec;
@@ -160,15 +157,11 @@ public class VisorCacheMetrics implements Serializable {
/**
* Calculate rate of metric per second.
*
- * @param metric Metric value.
- * @param time Metric finish time.
- * @param createTime Metric start time.
+ * @param meanTime Metric mean time.
* @return Metric per second.
*/
- private static int perSecond(int metric, long time, long createTime) {
- long seconds = (time - createTime) / 1000;
-
- return (seconds > 0) ? (int)(metric / seconds) : 0;
+ private static int perSecond(float meanTime) {
+ return (meanTime > 0) ? (int)(MICROSECONDS_IN_SECOND / meanTime) : 0;
}
/**
@@ -209,12 +202,11 @@ public class VisorCacheMetrics implements Serializable {
cm.avgPutTime = m.getAveragePutTime();
cm.avgRemovalTime = m.getAverageRemoveTime();
- cm.readsPerSec = (int)(MICROSECONDS_IN_SECOND * 1.f / m.getAverageGetTime());
- cm.writesPerSec = (int)(MICROSECONDS_IN_SECOND * 1.f / m.getAveragePutTime());
- cm.hitsPerSec = -1;
- cm.missesPerSec = (int)(MICROSECONDS_IN_SECOND * 1.f / m.getAverageRemoveTime());
- cm.commitsPerSec = (int)(MICROSECONDS_IN_SECOND * 1.f / m.getAverageTxCommitTime());
- cm.rollbacksPerSec = (int)(MICROSECONDS_IN_SECOND * 1.f / m.getAverageTxRollbackTime());
+ cm.readsPerSec = perSecond(m.getAverageGetTime());
+ cm.putsPerSec = perSecond(m.getAveragePutTime());
+ cm.removalsPerSec = perSecond(m.getAverageRemoveTime());
+ cm.commitsPerSec = perSecond(m.getAverageTxCommitTime());
+ cm.rollbacksPerSec = perSecond(m.getAverageTxRollbackTime());
cm.qryMetrics = VisorCacheQueryMetrics.from(c.context().queries().metrics());
@@ -364,24 +356,17 @@ public class VisorCacheMetrics implements Serializable {
}
/**
- * @return Writes per second.
- */
- public int writesPerSecond() {
- return writesPerSec;
- }
-
- /**
- * @return Hits per second.
+ * @return Puts per second.
*/
- public int hitsPerSecond() {
- return hitsPerSec;
+ public int putsPerSecond() {
+ return putsPerSec;
}
/**
- * @return Misses per second.
+ * @return Removes per second.
*/
- public int missesPerSecond() {
- return missesPerSec;
+ public int removalsPerSecond() {
+ return removalsPerSec;
}
/**