Repository: hbase Updated Branches: refs/heads/branch-2 3ff84a2da -> af25940b2
HBASE-18252 Resolve BaseLoadBalancer bad practice warnings Signed-off-by: tedyu <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/af25940b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/af25940b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/af25940b Branch: refs/heads/branch-2 Commit: af25940b2588648bdac8331c312e1be0ac396b67 Parents: 3ff84a2 Author: QilinCao <[email protected]> Authored: Wed Jun 21 18:34:29 2017 +0800 Committer: tedyu <[email protected]> Committed: Wed Jun 21 10:12:57 2017 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/master/balancer/BaseLoadBalancer.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/af25940b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java index 3556e17..fda9f60 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java @@ -914,7 +914,7 @@ public abstract class BaseLoadBalancer implements LoadBalancer { private Comparator<Integer> numRegionsComparator = new Comparator<Integer>() { @Override public int compare(Integer integer, Integer integer2) { - return Integer.valueOf(getNumRegions(integer)).compareTo(getNumRegions(integer2)); + return Integer.compare(getNumRegions(integer), getNumRegions(integer2)); } }; @@ -929,15 +929,7 @@ public abstract class BaseLoadBalancer implements LoadBalancer { private Comparator<Integer> localityComparator = new Comparator<Integer>() { @Override public int compare(Integer integer, Integer integer2) { - float locality1 = getLocality(integer); - float locality2 = getLocality(integer2); - if (locality1 < locality2) { - return -1; - } else if (locality1 > locality2) { - return 1; - } else { - return 0; - } + return Float.compare(getLocality(integer), getLocality(integer2)); } };
