Updated Branches: refs/heads/trunk b289de1a7 -> 531d01c04
remove intialCapacity from rowcache patch by Vijay; reviewed by xedin for CASSANDRA-4141 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/531d01c0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/531d01c0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/531d01c0 Branch: refs/heads/trunk Commit: 531d01c04d120f4a784eab898240a6b7e59bf1c8 Parents: b289de1 Author: Vijay Parthasarathy <[email protected]> Authored: Thu Apr 12 08:36:22 2012 -0700 Committer: Vijay Parthasarathy <[email protected]> Committed: Thu Apr 12 08:38:28 2012 -0700 ---------------------------------------------------------------------- .../cassandra/cache/ConcurrentLinkedHashCache.java | 1 - .../apache/cassandra/cache/SerializingCache.java | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/531d01c0/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 5c984df..862e739 100644 --- a/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java +++ b/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java @@ -66,7 +66,6 @@ public class ConcurrentLinkedHashCache<K, V> implements ICache<K, V> { ConcurrentLinkedHashMap<K, V> map = new ConcurrentLinkedHashMap.Builder<K, V>() .weigher(weigher) - .initialCapacity(0) .maximumWeightedCapacity(weightedCapacity) .concurrencyLevel(DEFAULT_CONCURENCY_LEVEL) .build(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/531d01c0/src/java/org/apache/cassandra/cache/SerializingCache.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cache/SerializingCache.java b/src/java/org/apache/cassandra/cache/SerializingCache.java index cd74611..1dac92e 100644 --- a/src/java/org/apache/cassandra/cache/SerializingCache.java +++ b/src/java/org/apache/cassandra/cache/SerializingCache.java @@ -61,7 +61,6 @@ public class SerializingCache<K, V> implements ICache<K, V> .weigher(useMemoryWeigher ? createMemoryWeigher() : Weighers.<FreeableMemory>singleton()) - .initialCapacity(capacity) .maximumWeightedCapacity(capacity) .concurrencyLevel(DEFAULT_CONCURENCY_LEVEL) .listener(listener)
