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 1F56E11943 for ; Wed, 14 May 2014 23:36:06 +0000 (UTC) Received: (qmail 36162 invoked by uid 500); 10 May 2014 22:00:38 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 3574 invoked by uid 500); 10 May 2014 21:58:24 -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 62627 invoked by uid 99); 10 May 2014 21:56:23 -0000 Received: from Unknown (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 May 2014 21:56:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3B45091FE8C; Thu, 8 May 2014 01:23:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Thu, 08 May 2014 01:23:18 -0000 Message-Id: <191d8f0e08c0480298f2eca0f970d6fd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: reduce garbage creation in calculatePendingRanges Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 d267cf88c -> 773b95efb reduce garbage creation in calculatePendingRanges patch by dbrosius reviewed by bwilliams for cassandra-7191 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d839350f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d839350f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d839350f Branch: refs/heads/cassandra-2.1 Commit: d839350f42405ccd85ff478bd13bad9920522dee Parents: 21b3a67 Author: Dave Brosius Authored: Wed May 7 21:17:48 2014 -0400 Committer: Dave Brosius Committed: Wed May 7 21:17:48 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/PendingRangeCalculatorService.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d839350f/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 8533e64..312cf06 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -22,6 +22,7 @@ * fix time conversion to milliseconds in SimpleCondition.await (CASSANDRA-7149) * remove duplicate query for local tokens (CASSANDRA-7182) * raise streaming phi convict threshold level (CASSANDRA-7063) + * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191) 1.2.16 * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d839350f/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java b/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java index b408c75..6f77ace 100644 --- a/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java +++ b/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java @@ -43,7 +43,6 @@ import java.util.Set; import java.util.Collection; import java.util.concurrent.*; - public class PendingRangeCalculatorService extends PendingRangeCalculatorServiceMBean { public static final PendingRangeCalculatorService instance = new PendingRangeCalculatorService(); @@ -157,9 +156,10 @@ public class PendingRangeCalculatorService extends PendingRangeCalculatorService // For each of the bootstrapping nodes, simply add and remove them one by one to // allLeftMetadata and check in between what their ranges would be. - for (InetAddress endpoint : bootstrapTokens.inverse().keySet()) + Multimap bootstrapAddresses = bootstrapTokens.inverse(); + for (InetAddress endpoint : bootstrapAddresses.keySet()) { - Collection tokens = bootstrapTokens.inverse().get(endpoint); + Collection tokens = bootstrapAddresses.get(endpoint); allLeftMetadata.updateNormalTokens(tokens, endpoint); for (Range range : strategy.getAddressRanges(allLeftMetadata).get(endpoint))