Author: jbellis Date: Thu Oct 6 16:00:59 2011 New Revision: 1179676 URL: http://svn.apache.org/viewvc?rev=1179676&view=rev Log: avoid including compaction cache-warming in keycache stats patch by Fabien Rousseau; reviewed by jbellis for CASSANDRA-3325
Modified: cassandra/branches/cassandra-1.0.0/CHANGES.txt cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/CompactionTask.java cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/io/sstable/SSTableReader.java Modified: cassandra/branches/cassandra-1.0.0/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/CHANGES.txt?rev=1179676&r1=1179675&r2=1179676&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0.0/CHANGES.txt (original) +++ cassandra/branches/cassandra-1.0.0/CHANGES.txt Thu Oct 6 16:00:59 2011 @@ -8,6 +8,7 @@ * Fix broken CompressedRandomAccessReaderTest (CASSANDRA-3298) * (CQL) fix type information returned for wildcard queries (CASSANDRA-3311) * add estimated tasks to LeveledCompactionStrategy (CASSANDRA-3322) + * avoid including compaction cache-warming in keycache stats (CASSANDRA-3325) Fixes merged from 0.8 below: * Fix tool .bat files when CASSANDRA_HOME contains spaces (CASSANDRA-3258) * Force flush of status table when removing/updating token (CASSANDRA-3243) Modified: cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/CompactionTask.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/CompactionTask.java?rev=1179676&r1=1179675&r2=1179676&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/CompactionTask.java (original) +++ cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/CompactionTask.java Thu Oct 6 16:00:59 2011 @@ -169,7 +169,7 @@ public class CompactionTask extends Abst { for (SSTableReader sstable : toCompact) { - if (sstable.getCachedPosition(row.key) != null) + if (sstable.getCachedPosition(row.key, false) != null) { cachedKeys.put(row.key, position); break; Modified: cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/io/sstable/SSTableReader.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/io/sstable/SSTableReader.java?rev=1179676&r1=1179675&r2=1179676&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/io/sstable/SSTableReader.java (original) +++ cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/io/sstable/SSTableReader.java Thu Oct 6 16:00:59 2011 @@ -572,15 +572,15 @@ public class SSTableReader extends SSTab keyCache.put(new Pair<Descriptor, DecoratedKey>(descriptor, copiedKey), info); } - public Long getCachedPosition(DecoratedKey key) + public Long getCachedPosition(DecoratedKey key, boolean updateStats) { - return getCachedPosition(new Pair<Descriptor, DecoratedKey>(descriptor, key)); + return getCachedPosition(new Pair<Descriptor, DecoratedKey>(descriptor, key), updateStats); } - private Long getCachedPosition(Pair<Descriptor, DecoratedKey> unifiedKey) + private Long getCachedPosition(Pair<Descriptor, DecoratedKey> unifiedKey, boolean updateStats) { if (keyCache != null && keyCache.getCapacity() > 0) - return keyCache.get(unifiedKey); + return updateStats ? keyCache.get(unifiedKey) : keyCache.getInternal(unifiedKey); return null; } @@ -603,7 +603,7 @@ public class SSTableReader extends SSTab if (op == Operator.EQ || op == Operator.GE) { Pair<Descriptor, DecoratedKey> unifiedKey = new Pair<Descriptor, DecoratedKey>(descriptor, decoratedKey); - Long cachedPosition = getCachedPosition(unifiedKey); + Long cachedPosition = getCachedPosition(unifiedKey, true); if (cachedPosition != null) return cachedPosition; }