Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 39F17C9D7 for ; Fri, 28 Jun 2013 10:50:09 +0000 (UTC) Received: (qmail 75339 invoked by uid 500); 28 Jun 2013 10:50:09 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 75314 invoked by uid 500); 28 Jun 2013 10:50:09 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 75306 invoked by uid 99); 28 Jun 2013 10:50:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jun 2013 10:50:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jun 2013 10:50:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9176C23888FE; Fri, 28 Jun 2013 10:49:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1497723 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: api/jmx/CacheStatsMBean.java cache/CacheStats.java Date: Fri, 28 Jun 2013 10:49:48 -0000 To: oak-commits@jackrabbit.apache.org From: chetanm@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130628104948.9176C23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chetanm Date: Fri Jun 28 10:49:48 2013 New Revision: 1497723 URL: http://svn.apache.org/r1497723 Log: OAK-863 - Enable stats for various caches used in Oak by default -- Renaming the resetCache -> resetStats Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/CacheStatsMBean.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/CacheStatsMBean.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/CacheStatsMBean.java?rev=1497723&r1=1497722&r2=1497723&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/CacheStatsMBean.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/CacheStatsMBean.java Fri Jun 28 10:49:48 2013 @@ -134,5 +134,5 @@ public interface CacheStatsMBean { /** * Reset the cache stats */ - void resetCache(); + void resetStats(); } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java?rev=1497723&r1=1497722&r2=1497723&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java Fri Jun 28 10:49:48 2013 @@ -31,7 +31,7 @@ public class CacheStats implements Cache private final Weigher weigher; private final long maxWeight; private final String name; - private com.google.common.cache.CacheStats statsSnapShot = + private com.google.common.cache.CacheStats lastSnapshot = new com.google.common.cache.CacheStats(0,0,0,0,0,0); public CacheStats(Cache cache, String name, Weigher weigher, long maxWeight) { @@ -124,10 +124,10 @@ public class CacheStats implements Cache } @Override - public synchronized void resetCache(){ + public synchronized void resetStats(){ //Cache stats cannot be rest at Guava level. Instead we //take a snapshot and then subtract it from future stats calls - statsSnapShot = cache.stats(); + lastSnapshot = cache.stats(); } @Override @@ -142,11 +142,11 @@ public class CacheStats implements Cache .add("loadSuccessCount", getLoadSuccessCount()) .add("loadExceptionCount", getLoadExceptionCount()) .add("totalLoadTime", getTotalLoadTime()) - .add("averageLoadPenalty", String.format("%1.2f",getAverageLoadPenalty())) + .add("averageLoadPenalty", String.format("%1.2f", getAverageLoadPenalty())) .add("evictionCount", getEvictionCount()) .add("elementCount", getElementCount()) .add("totalWeight", humanReadableByteCount(estimateCurrentWeight(), true)) - .add("maxWeight", humanReadableByteCount(getMaxTotalWeight(),true)) + .add("maxWeight", humanReadableByteCount(getMaxTotalWeight(), true)) .toString(); } @@ -155,7 +155,7 @@ public class CacheStats implements Cache } private com.google.common.cache.CacheStats stats() { - return cache.stats().minus(statsSnapShot); + return cache.stats().minus(lastSnapshot); } /**