Fix counting cache serialization in request metrics patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-9466
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04287d44 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04287d44 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04287d44 Branch: refs/heads/cassandra-2.2 Commit: 04287d440a00d5d13c948007cd01954b782da05a Parents: 2beb66e Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue May 26 13:13:38 2015 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue May 26 13:13:38 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/CacheService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04287d44/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index cf124b4..0bff87b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.16: + * Fix counting cache serialization in request metrics (CASSANDRA-9466) * (cqlsh) Add LOGIN command to switch users (CASSANDRA-7212) * Clone SliceQueryFilter in AbstractReadCommand implementations (CASSANDRA-8940) * Push correct protocol notification for DROP INDEX (CASSANDRA-9310) http://git-wip-us.apache.org/repos/asf/cassandra/blob/04287d44/src/java/org/apache/cassandra/service/CacheService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/CacheService.java b/src/java/org/apache/cassandra/service/CacheService.java index f626e17..cf0db97 100644 --- a/src/java/org/apache/cassandra/service/CacheService.java +++ b/src/java/org/apache/cassandra/service/CacheService.java @@ -335,7 +335,7 @@ public class CacheService implements CacheServiceMBean { public void serialize(KeyCacheKey key, DataOutput out) throws IOException { - RowIndexEntry entry = CacheService.instance.keyCache.get(key); + RowIndexEntry entry = CacheService.instance.keyCache.getInternal(key); if (entry == null) return; ByteBufferUtil.writeWithLength(key.key, out);
