Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id F0350200CCF for ; Mon, 24 Jul 2017 23:26:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EEEF716561E; Mon, 24 Jul 2017 21:26:45 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4993E1655E0 for ; Mon, 24 Jul 2017 23:26:45 +0200 (CEST) Received: (qmail 92441 invoked by uid 500); 24 Jul 2017 21:26:39 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 92180 invoked by uid 99); 24 Jul 2017 21:26:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Jul 2017 21:26:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3CF97DFA84; Mon, 24 Jul 2017 21:26:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Mon, 24 Jul 2017 21:26:42 -0000 Message-Id: <43c27193b4fd451bacfd90008a16a987@git.apache.org> In-Reply-To: <796648929a37498998c5badd91369872@git.apache.org> References: <796648929a37498998c5badd91369872@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/9] accumulo git commit: ACCUMULO-4685 Fix minor type safety issues archived-at: Mon, 24 Jul 2017 21:26:46 -0000 ACCUMULO-4685 Fix minor type safety issues Use diamond operator and generic method for emptySet Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f061b99 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f061b99 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f061b99 Branch: refs/heads/1.8 Commit: 0f061b99cfae4fa9676ee5989eaf23682d1e61d9 Parents: 62d43cb Author: Christopher Tubbs Authored: Mon Jul 24 16:27:53 2017 -0400 Committer: Christopher Tubbs Committed: Mon Jul 24 16:27:53 2017 -0400 ---------------------------------------------------------------------- .../server/master/balancer/HostRegexTableLoadBalancer.java | 4 ++-- .../server/master/balancer/HostRegexTableLoadBalancerTest.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f061b99/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java index dbf03d0..72a3a23 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java @@ -95,7 +95,7 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con protected long oobCheckMillis = AccumuloConfiguration.getTimeInMillis(HOST_BALANCER_OOB_DEFAULT); private static final long ONE_HOUR = 60 * 60 * 1000; - private static final Set EMPTY_MIGRATIONS = Collections.EMPTY_SET; + private static final Set EMPTY_MIGRATIONS = Collections.emptySet(); private Map tableIdToTableName = null; private Map poolNameToRegexPattern = null; @@ -411,7 +411,7 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con LOG.trace("Sample up to 10 outstanding migrations: {}", Iterables.limit(migrations, 10)); } migrationsFromLastPass.keySet().retainAll(migrations); - SortedMap currentCopy = new TreeMap(current); + SortedMap currentCopy = new TreeMap<>(current); Multimap serverTableIdCopied = HashMultimap.create(); for (TabletMigration migration : migrationsFromLastPass.values()) { TableInfo fromInfo = getTableInfo(currentCopy, serverTableIdCopied, migration.tablet.getTableId().toString(), migration.oldServer); http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f061b99/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java index 120aab9..094ada8 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java @@ -36,7 +36,6 @@ import org.apache.accumulo.core.data.thrift.TKeyExtent; import org.apache.accumulo.core.master.thrift.TabletServerStatus; import org.apache.accumulo.core.tabletserver.thrift.TabletStats; import org.apache.accumulo.fate.util.UtilWaitThread; -import org.apache.accumulo.server.conf.ServerConfiguration; import org.apache.accumulo.server.conf.TableConfiguration; import org.apache.accumulo.server.master.state.TServerInstance; import org.apache.accumulo.server.master.state.TabletMigration; @@ -77,7 +76,7 @@ public class HostRegexTableLoadBalancerTest extends BaseHostRegexTableLoadBalanc @Test public void testBalance() { - init((ServerConfiguration) factory); + init(factory); Set migrations = new HashSet(); List migrationsOut = new ArrayList(); long wait = this.balance(Collections.unmodifiableSortedMap(createCurrent(15)), migrations, migrationsOut);