Return-Path: Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: (qmail 16846 invoked from network); 28 Dec 2010 21:49:25 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 28 Dec 2010 21:49:25 -0000 Received: (qmail 67669 invoked by uid 500); 28 Dec 2010 21:49:25 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 67645 invoked by uid 500); 28 Dec 2010 21:49:25 -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 67637 invoked by uid 99); 28 Dec 2010 21:49:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Dec 2010 21:49:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Dec 2010 21:49:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F0413238896F; Tue, 28 Dec 2010 21:49:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1053453 - /cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/TokenMetadata.java Date: Tue, 28 Dec 2010 21:49:01 -0000 To: commits@cassandra.apache.org From: brandonwilliams@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101228214901.F0413238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brandonwilliams Date: Tue Dec 28 21:49:01 2010 New Revision: 1053453 URL: http://svn.apache.org/viewvc?rev=1053453&view=rev Log: Avoid synchronization in getPendingRanges. Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-1370 Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/TokenMetadata.java Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/TokenMetadata.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/TokenMetadata.java?rev=1053453&r1=1053452&r2=1053453&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/TokenMetadata.java (original) +++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/TokenMetadata.java Tue Dec 28 21:49:01 2010 @@ -319,13 +319,15 @@ public class TokenMetadata } } - private synchronized Multimap getPendingRangesMM(String table) + private Multimap getPendingRangesMM(String table) { Multimap map = pendingRanges.get(table); if (map == null) { - map = HashMultimap.create(); - pendingRanges.put(table, map); + map = HashMultimap.create(); + Multimap newmap = pendingRanges.putIfAbsent(table, map); + if (newmap != null) + map = newmap; } return map; }