Updated Branches: refs/heads/trunk f593717ac -> f3b636fc2
clean up row cache updating Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f3b636fc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3b636fc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3b636fc Branch: refs/heads/trunk Commit: f3b636fc24e1b00f299a7c4ae29995d680c99fad Parents: 900e621 Author: Jonathan Ellis <[email protected]> Authored: Fri Oct 26 01:06:07 2012 -0700 Committer: Jonathan Ellis <[email protected]> Committed: Fri Oct 26 01:06:19 2012 -0700 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 8 ++++---- .../cassandra/streaming/IncomingStreamReader.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3b636fc/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 0e40fdc..3b1df99 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -709,10 +709,10 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean future.get(); } - public void updateRowCache(DecoratedKey key, ColumnFamily columnFamily) + public void maybeUpdateRowCache(DecoratedKey key, ColumnFamily columnFamily) { - if (metadata.cfId == null) - return; // secondary index + if (!isRowCacheEnabled()) + return; RowCacheKey cacheKey = new RowCacheKey(metadata.cfId, key); @@ -750,7 +750,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean Memtable mt = getMemtableThreadSafe(); mt.put(key, columnFamily, indexer); - updateRowCache(key, columnFamily); + maybeUpdateRowCache(key, columnFamily); metric.writeLatency.addNano(System.nanoTime() - start); // recompute liveRatio, if we have doubled the number of ops since last calculated http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3b636fc/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java b/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java index 48a1320..1c3fc4e 100644 --- a/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java +++ b/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java @@ -157,7 +157,7 @@ public class IncomingStreamReader // update cache ColumnFamily cf = row.getFullColumnFamily(); - cfs.updateRowCache(key, cf); + cfs.maybeUpdateRowCache(key, cf); } else {
