update measure to measureDeep patch by vijay reviewed by jbellis for CASSANDRA-4860
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d6e43f3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d6e43f3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d6e43f3 Branch: refs/heads/cassandra-1.2 Commit: 8d6e43f34f4b2507fe294ec08e7a5dafe2a9928e Parents: a2ca30e Author: Vijay Parthasarathy <vijay2...@gmail.com> Authored: Tue Nov 13 10:28:50 2012 -0800 Committer: Vijay Parthasarathy <vijay2...@gmail.com> Committed: Tue Nov 13 10:28:50 2012 -0800 ---------------------------------------------------------------------- .../cache/ConcurrentLinkedHashCacheProvider.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d6e43f3/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.java b/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.java index cab3df5..691eab6 100644 --- a/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.java +++ b/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.java @@ -42,7 +42,7 @@ public class ConcurrentLinkedHashCacheProvider implements IRowCacheProvider public int weightOf(IRowCacheEntry value) { - return (int) Math.min(meter.measure(value), Integer.MAX_VALUE); + return (int) Math.min(meter.measureDeep(value), Integer.MAX_VALUE); } }; }
