You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2014/08/31 07:10:44 UTC
svn commit: r1621560 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/
oak-core/src/main/java/org/apache/jackrabbit/oak/cache/ oak-doc/
Author: chetanm
Date: Sun Aug 31 05:10:43 2014
New Revision: 1621560
URL: http://svn.apache.org/r1621560
Log:
OAK-2060 - MBean to provide consolidated cache stats
Merging 1621168
Added:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/ConsolidatedCacheStatsMBean.java
- copied unchanged from r1621168, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/ConsolidatedCacheStatsMBean.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/ConsolidatedCacheStats.java
- copied unchanged from r1621168, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/ConsolidatedCacheStats.java
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/CacheStatsMBean.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java
jackrabbit/oak/branches/1.0/oak-doc/ (props changed)
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1621168
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/CacheStatsMBean.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/CacheStatsMBean.java?rev=1621560&r1=1621559&r2=1621560&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/CacheStatsMBean.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/CacheStatsMBean.java Sun Aug 31 05:10:43 2014
@@ -19,6 +19,8 @@ package org.apache.jackrabbit.oak.api.jm
public interface CacheStatsMBean {
String TYPE = "CacheStats";
+ String getName();
+
/**
* Returns the number of times {@link com.google.common.cache.Cache} lookup methods have returned either a cached or
* uncached value. This is defined as {@code getHitCount + getMissCount}.
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java?rev=1621560&r1=1621559&r2=1621560&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java Sun Aug 31 05:10:43 2014
@@ -166,7 +166,7 @@ public class CacheStats implements Cache
return cache.stats().minus(lastSnapshot);
}
- private static String timeInWords(long nanos) {
+ static String timeInWords(long nanos) {
long millis = TimeUnit.NANOSECONDS.toMillis(nanos);
return String.format("%d min, %d sec",
TimeUnit.MILLISECONDS.toMinutes(millis),
@@ -178,7 +178,7 @@ public class CacheStats implements Cache
/**
* Based on http://stackoverflow.com/a/3758880/1035417
*/
- private static String humanReadableByteCount(long bytes, boolean si) {
+ static String humanReadableByteCount(long bytes, boolean si) {
if (bytes < 0) {
return "0";
}
Propchange: jackrabbit/oak/branches/1.0/oak-doc/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk/oak-doc:r1621168