Updated Branches: refs/heads/trunk 84aba3a6a -> 383a608e7
only load key cache when caching is ALL/KEYS_ONLY, fix by yukim, reviewed by slebresne for CASSANDRA-4313 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/383a608e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/383a608e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/383a608e Branch: refs/heads/trunk Commit: 383a608e7ff73befaaf34ad7cc0aab4cc26d1316 Parents: 84aba3a Author: Yuki Morishita <[email protected]> Authored: Wed Jun 6 13:54:54 2012 -0500 Committer: Yuki Morishita <[email protected]> Committed: Wed Jun 6 13:54:54 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/383a608e/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 16c2145..dfa972a 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -224,7 +224,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean data = new DataTracker(this); Directories.SSTableLister sstables = directories.sstableLister().skipCompacted(true).skipTemporary(true); data.addInitialSSTables(SSTableReader.batchOpen(sstables.list().entrySet(), data, metadata, this.partitioner)); - if (caching != Caching.NONE || caching != Caching.ROWS_ONLY) + if (caching == Caching.ALL || caching == Caching.KEYS_ONLY) CacheService.instance.keyCache.loadSaved(this); // compaction strategy should be created after the CFS has been prepared
