From 99b245d3184c26bd29f4e17120a55bdb1a4b2912 Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@apache.org>
Date: Tue, 30 Oct 2012 10:22:22 -0500
Subject: [PATCH] add get[Row|Key]CacheEntries to CacheServiceMBean patch by
 Chris Burroughs; reviewed by jbellis for CASSANDRA-4859

---
 CHANGES.txt                                            |  1 +
 .../org/apache/cassandra/service/CacheService.java     | 10 ++++++++++
 .../apache/cassandra/service/CacheServiceMBean.java    |  4 +++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 05b7ef3fe1..e69298f479 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 1.1.7
+ * add get[Row|Key]CacheEntries to CacheServiceMBean (CASSANDRA-4859)
  * fix get_paged_slice to wrap to next row correctly (CASSANDRA-4816)
  * fix indexing empty column values (CASSANDRA-4832)
  * allow JdbcDate to compose null Date objects (CASSANDRA-4830)
diff --git a/src/java/org/apache/cassandra/service/CacheService.java b/src/java/org/apache/cassandra/service/CacheService.java
index bb57801e40..d63e77574f 100644
--- a/src/java/org/apache/cassandra/service/CacheService.java
+++ b/src/java/org/apache/cassandra/service/CacheService.java
@@ -248,11 +248,21 @@ public class CacheService implements CacheServiceMBean
         return rowCache.weightedSize();
     }
 
+    public long getRowCacheEntries()
+    {
+        return rowCache.size();
+    }
+
     public long getKeyCacheSize()
     {
         return keyCache.weightedSize() * AVERAGE_KEY_CACHE_ROW_SIZE;
     }
 
+    public long getKeyCacheEntries()
+    {
+        return keyCache.size();
+    }
+
     public void reduceCacheSizes()
     {
         reduceRowCacheSize();
diff --git a/src/java/org/apache/cassandra/service/CacheServiceMBean.java b/src/java/org/apache/cassandra/service/CacheServiceMBean.java
index bf9e46e7be..ccc7a429e2 100644
--- a/src/java/org/apache/cassandra/service/CacheServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/CacheServiceMBean.java
@@ -54,9 +54,11 @@ public interface CacheServiceMBean
     public long getKeyCacheCapacityInBytes();
     public void setKeyCacheCapacityInMB(long capacity);
 
-    public long getRowCacheSize();
+    public long getRowCacheSize(); // in bytes
+    public long getRowCacheEntries();
 
     public long getKeyCacheSize();
+    public long getKeyCacheEntries();
 
     /**
      * sets each cache's maximum capacity to "reduce_cache_capacity_to" of its current size