svn commit: r907087 - in /incubator/cassandra/trunk/src/java/org/apache/cassandra: cache/InstrumentedCache.java db/ColumnFamilyStore.java

[jb...@apache.org]

Author: jbellis
Date: Fri Feb  5 20:59:48 2010
New Revision: 907087

URL: http://svn.apache.org/viewvc?rev=907087&view=rev
Log:
avoid accidentally generating a cache read statistic on writes to cached CFs.  patch by jbellis; reviewed by Brandon Williams for CASSANDRA-770

Modified:
    incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentedCache.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentedCache.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentedCache.java?rev=907087&r1=907086&r2=907087&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentedCache.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/cache/InstrumentedCache.java Fri Feb  5 20:59:48 2010
@@ -32,6 +32,11 @@
         return v;
     }
 
+    public V getInternal(K key)
+    {
+        return map.get(key);
+    }
+
     public void remove(K key)
     {
         map.remove(key);

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=907087&r1=907086&r2=907087&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Fri Feb  5 20:59:48 2010
@@ -1164,10 +1164,10 @@
         return ssTables_.size();
     }
 
-    /** raw cached row -- does not fetch the row if it is not present */
+    /** raw cached row -- does not fetch the row if it is not present.  not counted in cache statistics.  */
     public ColumnFamily getRawCachedRow(String key)
     {
-        return rowCache.getCapacity() == 0 ? null : rowCache.get(key);
+        return rowCache.getCapacity() == 0 ? null : rowCache.getInternal(key);
     }
 
     void invalidateCachedRow(String key)