Author: jbellis Date: Thu Jun 16 16:23:03 2011 New Revision: 1136529 URL: http://svn.apache.org/viewvc?rev=1136529&view=rev Log: fix cache mbean getSize patch by Chris Burroughs; reviewed by Ryan King for CASSANDRA-2781
Modified: cassandra/branches/cassandra-0.8/CHANGES.txt cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/InstrumentingCache.java cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/InstrumentingCacheMBean.java cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/NodeCmd.java Modified: cassandra/branches/cassandra-0.8/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1136529&r1=1136528&r2=1136529&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/CHANGES.txt (original) +++ cassandra/branches/cassandra-0.8/CHANGES.txt Thu Jun 16 16:23:03 2011 @@ -1,3 +1,7 @@ +0.8.2 + * fix cache mbean getSize (CASSANDRA-2781) + + 0.8.1 * CQL: - support for insert, delete in BATCH (CASSANDRA-2537) Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/InstrumentingCache.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/InstrumentingCache.java?rev=1136529&r1=1136528&r2=1136529&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/InstrumentingCache.java (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/InstrumentingCache.java Thu Jun 16 16:23:03 2011 @@ -108,6 +108,11 @@ public class InstrumentingCache<K, V> im return map.size(); } + public int getSize() + { + return size(); + } + public long getHits() { return hits.get(); Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/InstrumentingCacheMBean.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/InstrumentingCacheMBean.java?rev=1136529&r1=1136528&r2=1136529&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/InstrumentingCacheMBean.java (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/InstrumentingCacheMBean.java Thu Jun 16 16:23:03 2011 @@ -25,7 +25,7 @@ public interface InstrumentingCacheMBean { public int getCapacity(); public void setCapacity(int capacity); - public int size(); + public int getSize(); /** total request count since cache creation */ public long getRequests(); Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/NodeCmd.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/NodeCmd.java?rev=1136529&r1=1136528&r2=1136529&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/NodeCmd.java (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/NodeCmd.java Thu Jun 16 16:23:03 2011 @@ -450,7 +450,7 @@ public class NodeCmd if (keyCacheMBean.getCapacity() > 0) { outs.println("\t\tKey cache capacity: " + keyCacheMBean.getCapacity()); - outs.println("\t\tKey cache size: " + keyCacheMBean.size()); + outs.println("\t\tKey cache size: " + keyCacheMBean.getSize()); outs.println("\t\tKey cache hit rate: " + keyCacheMBean.getRecentHitRate()); } else @@ -462,7 +462,7 @@ public class NodeCmd if (rowCacheMBean.getCapacity() > 0) { outs.println("\t\tRow cache capacity: " + rowCacheMBean.getCapacity()); - outs.println("\t\tRow cache size: " + rowCacheMBean.size()); + outs.println("\t\tRow cache size: " + rowCacheMBean.getSize()); outs.println("\t\tRow cache hit rate: " + rowCacheMBean.getRecentHitRate()); } else