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 CAD4117D33 for ; Thu, 2 Oct 2014 02:04:10 +0000 (UTC) Received: (qmail 51487 invoked by uid 500); 2 Oct 2014 02:04:10 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 51441 invoked by uid 500); 2 Oct 2014 02:04:10 -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 51432 invoked by uid 99); 2 Oct 2014 02:04:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Oct 2014 02:04:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 366D9A0B348; Thu, 2 Oct 2014 02:04:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: enis@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: HBASE-12127 Move the core Connection creation functionality into ConnectionFactory (Solomon Duskis) Date: Thu, 2 Oct 2014 02:04:10 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1 e00492b2c -> 17b2c0f90 HBASE-12127 Move the core Connection creation functionality into ConnectionFactory (Solomon Duskis) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/17b2c0f9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/17b2c0f9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/17b2c0f9 Branch: refs/heads/branch-1 Commit: 17b2c0f90e5af5565a1dd01593c0ff85a04a60c0 Parents: e00492b Author: Enis Soztutar Authored: Wed Oct 1 19:00:59 2014 -0700 Committer: Enis Soztutar Committed: Wed Oct 1 19:02:56 2014 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/client/ConnectionFactory.java | 25 +++++++++++++++++++- .../hadoop/hbase/client/ConnectionManager.java | 20 +--------------- 2 files changed, 25 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/17b2c0f9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionFactory.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionFactory.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionFactory.java index 6070615..74f7c54 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionFactory.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionFactory.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.client; import java.io.IOException; +import java.lang.reflect.Constructor; import java.util.concurrent.ExecutorService; import org.apache.hadoop.hbase.classification.InterfaceAudience; @@ -179,7 +180,29 @@ public class ConnectionFactory { user = provider.getCurrent(); } - return ConnectionManager.createConnection(conf, pool, user); + return createConnection(conf, false, pool, user); } + static Connection createConnection(final Configuration conf, final boolean managed, + final ExecutorService pool, final User user) + throws IOException { + String className = conf.get(HConnection.HBASE_CLIENT_CONNECTION_IMPL, + ConnectionManager.HConnectionImplementation.class.getName()); + Class clazz = null; + try { + clazz = Class.forName(className); + } catch (ClassNotFoundException e) { + throw new IOException(e); + } + try { + // Default HCM#HCI is not accessible; make it so before invoking. + Constructor constructor = + clazz.getDeclaredConstructor(Configuration.class, + boolean.class, ExecutorService.class, User.class); + constructor.setAccessible(true); + return (Connection) constructor.newInstance(conf, managed, pool, user); + } catch (Exception e) { + throw new IOException(e); + } + } } http://git-wip-us.apache.org/repos/asf/hbase/blob/17b2c0f9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java index 398d209..00c2b51 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java @@ -21,7 +21,6 @@ package org.apache.hadoop.hbase.client; import java.io.Closeable; import java.io.IOException; import java.io.InterruptedIOException; -import java.lang.reflect.Constructor; import java.lang.reflect.UndeclaredThrowableException; import java.util.ArrayList; import java.util.Date; @@ -404,24 +403,7 @@ class ConnectionManager { static ClusterConnection createConnection(final Configuration conf, final boolean managed, final ExecutorService pool, final User user) throws IOException { - String className = conf.get(HConnection.HBASE_CLIENT_CONNECTION_IMPL, - HConnectionImplementation.class.getName()); - Class clazz = null; - try { - clazz = Class.forName(className); - } catch (ClassNotFoundException e) { - throw new IOException(e); - } - try { - // Default HCM#HCI is not accessible; make it so before invoking. - Constructor constructor = - clazz.getDeclaredConstructor(Configuration.class, - boolean.class, ExecutorService.class, User.class); - constructor.setAccessible(true); - return (ClusterConnection) constructor.newInstance(conf, managed, pool, user); - } catch (Exception e) { - throw new IOException(e); - } + return (ClusterConnection) ConnectionFactory.createConnection(conf, managed, pool, user); } /**