You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by vi...@apache.org on 2012/11/13 19:45:31 UTC
[2/2] git commit: update measure to measureDeep patch by vijay
reviewed by jbellis for CASSANDRA-4860
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/94fa8255
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94fa8255
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94fa8255
Branch: refs/heads/cassandra-1.2
Commit: 94fa82558f198489e0eefb0c14392607d5d23224
Parents: 9c5e5dc
Author: Vijay Parthasarathy <vi...@gmail.com>
Authored: Tue Nov 13 10:42:26 2012 -0800
Committer: Vijay Parthasarathy <vi...@gmail.com>
Committed: Tue Nov 13 10:42:26 2012 -0800
----------------------------------------------------------------------
.../cassandra/cache/ConcurrentLinkedHashCache.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94fa8255/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java b/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java
index 375a7d0..0f992d3 100644
--- a/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java
+++ b/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java
@@ -57,7 +57,7 @@ public class ConcurrentLinkedHashCache<K, V> implements ICache<K, V>
{
public int weightOf(K key, V value)
{
- long size = meter.measure(key) + meter.measure(value);
+ long size = meter.measureDeep(key) + meter.measureDeep(value);
assert size < Integer.MAX_VALUE : "Serialized size cannot be more than 2GB/Integer.MAX_VALUE";
return (int) size;
}