Repository: hbase Updated Branches: refs/heads/branch-1 8151503fa -> 050c13e83
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/050c13e8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/050c13e8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/050c13e8 Branch: refs/heads/branch-1 Commit: 050c13e83f8483c5a44d543a842eb51e35644a9f Parents: 8151503 Author: tedyu <[email protected]> Authored: Sat Mar 19 17:23:29 2016 -0700 Committer: tedyu <[email protected]> Committed: Sat Mar 19 17:23:29 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/050c13e8/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 d1fb6d1..9a67990 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 @@ -379,7 +379,7 @@ class AsyncProcess { // Remember the previous decisions about regions or region servers we put in the // final multi. - Map<Long, Boolean> regionIncluded = new HashMap<Long, Boolean>(); + Map<HRegionInfo, Boolean> regionIncluded = new HashMap<HRegionInfo, Boolean>(); Map<ServerName, Boolean> serverIncluded = new HashMap<ServerName, Boolean>(); int posInList = -1; @@ -481,10 +481,10 @@ class AsyncProcess { * @return true if this region is considered as busy. */ protected boolean canTakeOperation(HRegionLocation loc, - Map<Long, Boolean> regionsIncluded, + Map<HRegionInfo, Boolean> regionsIncluded, Map<ServerName, Boolean> 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. @@ -494,14 +494,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; } @@ -524,7 +524,7 @@ class AsyncProcess { } if (!ok) { - regionsIncluded.put(regionId, Boolean.FALSE); + regionsIncluded.put(regionInfo, Boolean.FALSE); serversIncluded.put(loc.getServerName(), Boolean.FALSE); return false; } @@ -534,7 +534,7 @@ class AsyncProcess { assert serverPrevious.equals(Boolean.TRUE); } - regionsIncluded.put(regionId, Boolean.TRUE); + regionsIncluded.put(regionInfo, Boolean.TRUE); return true; }
