Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 771F49D96 for ; Thu, 12 Apr 2012 15:37:34 +0000 (UTC) Received: (qmail 39978 invoked by uid 500); 12 Apr 2012 15:37:34 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 39947 invoked by uid 500); 12 Apr 2012 15:37:34 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 39939 invoked by uid 99); 12 Apr 2012 15:37:34 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Apr 2012 15:37:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F3830C8F5; Thu, 12 Apr 2012 15:37:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vijay@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: remove intialCapacity from rowcache patch by Vijay; reviewed by xedin for CASSANDRA-4141 Message-Id: <20120412153733.F3830C8F5@tyr.zones.apache.org> Date: Thu, 12 Apr 2012 15:37:33 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.1 8909e1a92 -> 33cdcaf73 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/33cdcaf7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33cdcaf7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33cdcaf7 Branch: refs/heads/cassandra-1.1 Commit: 33cdcaf73463c351ada6e64dcd158a4823bdb902 Parents: 8909e1a Author: Vijay Parthasarathy Authored: Thu Apr 12 08:36:22 2012 -0700 Committer: Vijay Parthasarathy Committed: Thu Apr 12 08:36:22 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/33cdcaf7/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 a1cf4ea..ad651eb 100644 --- a/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java +++ b/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java @@ -69,7 +69,6 @@ public class ConcurrentLinkedHashCache implements ICache { ConcurrentLinkedHashMap map = new ConcurrentLinkedHashMap.Builder() .weigher(weigher) - .initialCapacity(0) .maximumWeightedCapacity(weightedCapacity) .concurrencyLevel(DEFAULT_CONCURENCY_LEVEL) .build(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/33cdcaf7/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 275130c..08fad20 100644 --- a/src/java/org/apache/cassandra/cache/SerializingCache.java +++ b/src/java/org/apache/cassandra/cache/SerializingCache.java @@ -65,7 +65,6 @@ public class SerializingCache implements ICache .weigher(useMemoryWeigher ? createMemoryWeigher() : Weighers.singleton()) - .initialCapacity(capacity) .maximumWeightedCapacity(capacity) .concurrencyLevel(DEFAULT_CONCURENCY_LEVEL) .listener(listener)