Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-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 C9DFF19F38 for ; Sun, 20 Mar 2016 00:23:59 +0000 (UTC) Received: (qmail 50189 invoked by uid 500); 20 Mar 2016 00:23:18 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 50163 invoked by uid 500); 20 Mar 2016 00:23:18 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 50154 invoked by uid 99); 20 Mar 2016 00:23:18 -0000 Received: from Unknown (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Mar 2016 00:23:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B1214DFC6E; Sun, 20 Mar 2016 00:23:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tedyu@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-15479 No more garbage or beware of autoboxing (Vladimir Rodionov) Date: Sun, 20 Mar 2016 00:23:01 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/master d2d8058ab -> dc6cd0bb7 HBASE-15479 No more garbage or beware of autoboxing (Vladimir Rodionov) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/dc6cd0bb Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dc6cd0bb Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dc6cd0bb Branch: refs/heads/master Commit: dc6cd0bb7412b8746e28886d42f6708b0c5f2322 Parents: d2d8058 Author: tedyu Authored: Sat Mar 19 17:22:53 2016 -0700 Committer: tedyu Committed: Sat Mar 19 17:22:53 2016 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/client/AsyncProcess.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/dc6cd0bb/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java index 2563a4b..cb45cf7 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java @@ -381,7 +381,7 @@ class AsyncProcess { // Remember the previous decisions about regions or region servers we put in the // final multi. - Map regionIncluded = new HashMap(); + Map regionIncluded = new HashMap(); Map serverIncluded = new HashMap(); int posInList = -1; @@ -483,10 +483,10 @@ class AsyncProcess { * @return true if this region is considered as busy. */ protected boolean canTakeOperation(HRegionLocation loc, - Map regionsIncluded, + Map regionsIncluded, Map serversIncluded) { - long regionId = loc.getRegionInfo().getRegionId(); - Boolean regionPrevious = regionsIncluded.get(regionId); + HRegionInfo regionInfo = loc.getRegionInfo(); + Boolean regionPrevious = regionsIncluded.get(regionInfo); if (regionPrevious != null) { // We already know what to do with this region. @@ -496,14 +496,14 @@ class AsyncProcess { Boolean serverPrevious = serversIncluded.get(loc.getServerName()); if (Boolean.FALSE.equals(serverPrevious)) { // It's a new region, on a region server that we have already excluded. - regionsIncluded.put(regionId, Boolean.FALSE); + regionsIncluded.put(regionInfo, Boolean.FALSE); return false; } AtomicInteger regionCnt = taskCounterPerRegion.get(loc.getRegionInfo().getRegionName()); if (regionCnt != null && regionCnt.get() >= maxConcurrentTasksPerRegion) { // Too many tasks on this region already. - regionsIncluded.put(regionId, Boolean.FALSE); + regionsIncluded.put(regionInfo, Boolean.FALSE); return false; } @@ -526,7 +526,7 @@ class AsyncProcess { } if (!ok) { - regionsIncluded.put(regionId, Boolean.FALSE); + regionsIncluded.put(regionInfo, Boolean.FALSE); serversIncluded.put(loc.getServerName(), Boolean.FALSE); return false; } @@ -536,7 +536,7 @@ class AsyncProcess { assert serverPrevious.equals(Boolean.TRUE); } - regionsIncluded.put(regionId, Boolean.TRUE); + regionsIncluded.put(regionInfo, Boolean.TRUE); return true; }