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 55B34181AE for ; Tue, 23 Feb 2016 05:58:29 +0000 (UTC) Received: (qmail 40509 invoked by uid 500); 23 Feb 2016 05:58:29 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 40456 invoked by uid 500); 23 Feb 2016 05:58:29 -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 40446 invoked by uid 99); 23 Feb 2016 05:58:29 -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; Tue, 23 Feb 2016 05:58:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CC131E05E1; Tue, 23 Feb 2016 05:58:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stack@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-15301 Remove the never-thrown NamingException from TableInputFormatBase#reverseDNS method signature (Yu Li) Date: Tue, 23 Feb 2016 05:58:28 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/master 2d66cd86d -> 5e501123c HBASE-15301 Remove the never-thrown NamingException from TableInputFormatBase#reverseDNS method signature (Yu Li) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5e501123 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5e501123 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5e501123 Branch: refs/heads/master Commit: 5e501123ca7854b18c63674029cdf3e7aeac5cf9 Parents: 2d66cd8 Author: stack Authored: Mon Feb 22 21:58:20 2016 -0800 Committer: stack Committed: Mon Feb 22 21:58:20 2016 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/mapreduce/TableInputFormatBase.java | 11 ++--------- .../hadoop/hbase/mapreduce/TestTableInputFormatBase.java | 4 +--- 2 files changed, 3 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/5e501123/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java index b2f115c..9b5bbfb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java @@ -27,8 +27,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import javax.naming.NamingException; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -285,12 +283,7 @@ extends InputFormat { } InetAddress regionAddress = isa.getAddress(); String regionLocation; - try { - regionLocation = reverseDNS(regionAddress); - } catch (NamingException e) { - LOG.warn("Cannot resolve the host name for " + regionAddress + " because of " + e); - regionLocation = location.getHostname(); - } + regionLocation = reverseDNS(regionAddress); byte[] startRow = scan.getStartRow(); byte[] stopRow = scan.getStopRow(); @@ -344,7 +337,7 @@ extends InputFormat { } } - String reverseDNS(InetAddress ipAddress) throws NamingException, UnknownHostException { + String reverseDNS(InetAddress ipAddress) throws UnknownHostException { String hostName = this.reverseDNSCacheMap.get(ipAddress); if (hostName == null) { String ipAddressString = null; http://git-wip-us.apache.org/repos/asf/hbase/blob/5e501123/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatBase.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatBase.java index c757a2d..699e773 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatBase.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatBase.java @@ -24,8 +24,6 @@ import java.net.Inet6Address; import java.net.InetAddress; import java.net.UnknownHostException; -import javax.naming.NamingException; - import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -34,7 +32,7 @@ import org.junit.experimental.categories.Category; public class TestTableInputFormatBase { @Test public void testTableInputFormatBaseReverseDNSForIPv6() - throws UnknownHostException, NamingException { + throws UnknownHostException { String address = "ipv6.google.com"; String localhost = null; InetAddress addr = null;