[08/50] [abbrv] phoenix git commit: PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps (Mujtaba Chohan)

2015-07-20 Thread maryannxue 
PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from 
starting up in client apps (Mujtaba Chohan)


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/dee7a02f
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/dee7a02f
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/dee7a02f

Branch: refs/heads/calcite
Commit: dee7a02f92ec3928a76c0d7536bd69f65fb1d4ef
Parents: d0c8f9d
Author: Thomas D'Silva tdsi...@salesforce.com
Authored: Tue Jul 7 13:40:18 2015 -0700
Committer: Thomas D'Silva tdsi...@salesforce.com
Committed: Tue Jul 7 13:40:18 2015 -0700

--
 .../apache/phoenix/mapreduce/util/ConnectionUtil.java   |  9 +
 .../mapreduce/util/PhoenixConfigurationUtil.java| 12 
 2 files changed, 17 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/dee7a02f/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
index 294d4e9..000ce59 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
@@ -54,7 +54,7 @@ public class ConnectionUtil {
  */
 public static Connection getInputConnection(final Configuration conf , 
final Properties props) throws SQLException {
 Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getInputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getInputCluster(conf), 
PhoenixConfigurationUtil.getClientPort(conf),
 PropertiesUtil.extractProperties(props, conf));
 }
 
@@ -77,7 +77,7 @@ public class ConnectionUtil {
  */
 public static Connection getOutputConnection(final Configuration conf, 
Properties props) throws SQLException {
 Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf), 
PhoenixConfigurationUtil.getClientPort(conf),
 PropertiesUtil.extractProperties(props, conf));
 }
 
@@ -85,11 +85,12 @@ public class ConnectionUtil {
  * Returns the {@link Connection} from a ZooKeeper cluster string.
  *
  * @param quorum a ZooKeeper quorum connection string
+ * @param clientPort a ZooKeeper client port
  * @return a Phoenix connection to the given connection string
  */
-private static Connection getConnection(final String quorum, Properties 
props) throws SQLException {
+private static Connection getConnection(final String quorum, final int 
clientPort, Properties props) throws SQLException {
 Preconditions.checkNotNull(quorum);
-return DriverManager.getConnection(QueryUtil.getUrl(quorum), props);
+return DriverManager.getConnection(QueryUtil.getUrl(quorum, 
clientPort), props);
 }
 
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/dee7a02f/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
index 6e0e5e4..bba96ac 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
@@ -94,6 +94,8 @@ public final class PhoenixConfigurationUtil {
 public static final String MAPREDUCE_INPUT_CLUSTER_QUORUM = 
phoenix.mapreduce.input.cluster.quorum;
 
 public static final String MAPREDUCE_OUTPUT_CLUSTER_QUORUM = 
phoneix.mapreduce.output.cluster.quorum;
+
+public static final String HBASE_ZOOKEEPER_CLIENT_PORT = 
hbase.zookeeper.property.clientPort;
 
 public enum SchemaType {
 TABLE,
@@ -363,6 +365,16 @@ public final class PhoenixConfigurationUtil {
 }
 return quorum;
 }
+
+/**
+ * Returns the HBase Client Port
+ * @param configuration
+ * @return
+ */
+public static int getClientPort(final Configuration configuration) {
+Preconditions.checkNotNull(configuration);
+return 
Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+}
 
 public static void loadHBaseConfiguration(Job job) throws IOException {
 // load

phoenix git commit: PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps (Mujtaba Chohan)

2015-07-07 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.4-HBase-1.0 8133f89d1 - cac6d5767


PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from 
starting up in client apps (Mujtaba Chohan)


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cac6d576
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cac6d576
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cac6d576

Branch: refs/heads/4.4-HBase-1.0
Commit: cac6d576758a6cb0eb010d04ed8fa70f272d1cf0
Parents: 8133f89
Author: Thomas D'Silva tdsi...@salesforce.com
Authored: Tue Jul 7 13:40:18 2015 -0700
Committer: Thomas D'Silva tdsi...@salesforce.com
Committed: Tue Jul 7 13:42:59 2015 -0700

--
 .../apache/phoenix/mapreduce/util/ConnectionUtil.java   |  9 +
 .../mapreduce/util/PhoenixConfigurationUtil.java| 12 
 2 files changed, 17 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/cac6d576/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
index 294d4e9..000ce59 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
@@ -54,7 +54,7 @@ public class ConnectionUtil {
  */
 public static Connection getInputConnection(final Configuration conf , 
final Properties props) throws SQLException {
 Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getInputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getInputCluster(conf), 
PhoenixConfigurationUtil.getClientPort(conf),
 PropertiesUtil.extractProperties(props, conf));
 }
 
@@ -77,7 +77,7 @@ public class ConnectionUtil {
  */
 public static Connection getOutputConnection(final Configuration conf, 
Properties props) throws SQLException {
 Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf), 
PhoenixConfigurationUtil.getClientPort(conf),
 PropertiesUtil.extractProperties(props, conf));
 }
 
@@ -85,11 +85,12 @@ public class ConnectionUtil {
  * Returns the {@link Connection} from a ZooKeeper cluster string.
  *
  * @param quorum a ZooKeeper quorum connection string
+ * @param clientPort a ZooKeeper client port
  * @return a Phoenix connection to the given connection string
  */
-private static Connection getConnection(final String quorum, Properties 
props) throws SQLException {
+private static Connection getConnection(final String quorum, final int 
clientPort, Properties props) throws SQLException {
 Preconditions.checkNotNull(quorum);
-return DriverManager.getConnection(QueryUtil.getUrl(quorum), props);
+return DriverManager.getConnection(QueryUtil.getUrl(quorum, 
clientPort), props);
 }
 
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/cac6d576/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
index 6e0e5e4..bba96ac 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
@@ -94,6 +94,8 @@ public final class PhoenixConfigurationUtil {
 public static final String MAPREDUCE_INPUT_CLUSTER_QUORUM = 
phoenix.mapreduce.input.cluster.quorum;
 
 public static final String MAPREDUCE_OUTPUT_CLUSTER_QUORUM = 
phoneix.mapreduce.output.cluster.quorum;
+
+public static final String HBASE_ZOOKEEPER_CLIENT_PORT = 
hbase.zookeeper.property.clientPort;
 
 public enum SchemaType {
 TABLE,
@@ -363,6 +365,16 @@ public final class PhoenixConfigurationUtil {
 }
 return quorum;
 }
+
+/**
+ * Returns the HBase Client Port
+ * @param configuration
+ * @return
+ */
+public static int getClientPort(final Configuration configuration) {
+Preconditions.checkNotNull(configuration);
+return 
Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+}

phoenix git commit: PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps (Mujtaba Chohan)

2015-07-07 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.4-HBase-1.1 93dc3d5b6 - 5a6b9967b


PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from 
starting up in client apps (Mujtaba Chohan)


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5a6b9967
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5a6b9967
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5a6b9967

Branch: refs/heads/4.4-HBase-1.1
Commit: 5a6b9967b06bc71ab8805796f218a989c203f047
Parents: 93dc3d5
Author: Thomas D'Silva tdsi...@salesforce.com
Authored: Tue Jul 7 13:40:18 2015 -0700
Committer: Thomas D'Silva tdsi...@salesforce.com
Committed: Tue Jul 7 13:44:03 2015 -0700

--
 .../apache/phoenix/mapreduce/util/ConnectionUtil.java   |  9 +
 .../mapreduce/util/PhoenixConfigurationUtil.java| 12 
 2 files changed, 17 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5a6b9967/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
index 294d4e9..000ce59 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
@@ -54,7 +54,7 @@ public class ConnectionUtil {
  */
 public static Connection getInputConnection(final Configuration conf , 
final Properties props) throws SQLException {
 Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getInputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getInputCluster(conf), 
PhoenixConfigurationUtil.getClientPort(conf),
 PropertiesUtil.extractProperties(props, conf));
 }
 
@@ -77,7 +77,7 @@ public class ConnectionUtil {
  */
 public static Connection getOutputConnection(final Configuration conf, 
Properties props) throws SQLException {
 Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf), 
PhoenixConfigurationUtil.getClientPort(conf),
 PropertiesUtil.extractProperties(props, conf));
 }
 
@@ -85,11 +85,12 @@ public class ConnectionUtil {
  * Returns the {@link Connection} from a ZooKeeper cluster string.
  *
  * @param quorum a ZooKeeper quorum connection string
+ * @param clientPort a ZooKeeper client port
  * @return a Phoenix connection to the given connection string
  */
-private static Connection getConnection(final String quorum, Properties 
props) throws SQLException {
+private static Connection getConnection(final String quorum, final int 
clientPort, Properties props) throws SQLException {
 Preconditions.checkNotNull(quorum);
-return DriverManager.getConnection(QueryUtil.getUrl(quorum), props);
+return DriverManager.getConnection(QueryUtil.getUrl(quorum, 
clientPort), props);
 }
 
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5a6b9967/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
index 6e0e5e4..bba96ac 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
@@ -94,6 +94,8 @@ public final class PhoenixConfigurationUtil {
 public static final String MAPREDUCE_INPUT_CLUSTER_QUORUM = 
phoenix.mapreduce.input.cluster.quorum;
 
 public static final String MAPREDUCE_OUTPUT_CLUSTER_QUORUM = 
phoneix.mapreduce.output.cluster.quorum;
+
+public static final String HBASE_ZOOKEEPER_CLIENT_PORT = 
hbase.zookeeper.property.clientPort;
 
 public enum SchemaType {
 TABLE,
@@ -363,6 +365,16 @@ public final class PhoenixConfigurationUtil {
 }
 return quorum;
 }
+
+/**
+ * Returns the HBase Client Port
+ * @param configuration
+ * @return
+ */
+public static int getClientPort(final Configuration configuration) {
+Preconditions.checkNotNull(configuration);
+return 
Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+}

phoenix git commit: PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps (Mujtaba Chohan)

2015-07-07 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 193fd92ec - f17e26775


PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from 
starting up in client apps (Mujtaba Chohan)


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f17e2677
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f17e2677
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f17e2677

Branch: refs/heads/4.x-HBase-1.0
Commit: f17e26775ccf47d6d8aa4b9df4fa96a85d68b9e3
Parents: 193fd92
Author: Thomas D'Silva tdsi...@salesforce.com
Authored: Tue Jul 7 13:40:18 2015 -0700
Committer: Thomas D'Silva tdsi...@salesforce.com
Committed: Tue Jul 7 13:46:47 2015 -0700

--
 .../apache/phoenix/mapreduce/util/ConnectionUtil.java   |  9 +
 .../mapreduce/util/PhoenixConfigurationUtil.java| 12 
 2 files changed, 17 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f17e2677/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
index 294d4e9..000ce59 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
@@ -54,7 +54,7 @@ public class ConnectionUtil {
  */
 public static Connection getInputConnection(final Configuration conf , 
final Properties props) throws SQLException {
 Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getInputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getInputCluster(conf), 
PhoenixConfigurationUtil.getClientPort(conf),
 PropertiesUtil.extractProperties(props, conf));
 }
 
@@ -77,7 +77,7 @@ public class ConnectionUtil {
  */
 public static Connection getOutputConnection(final Configuration conf, 
Properties props) throws SQLException {
 Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf), 
PhoenixConfigurationUtil.getClientPort(conf),
 PropertiesUtil.extractProperties(props, conf));
 }
 
@@ -85,11 +85,12 @@ public class ConnectionUtil {
  * Returns the {@link Connection} from a ZooKeeper cluster string.
  *
  * @param quorum a ZooKeeper quorum connection string
+ * @param clientPort a ZooKeeper client port
  * @return a Phoenix connection to the given connection string
  */
-private static Connection getConnection(final String quorum, Properties 
props) throws SQLException {
+private static Connection getConnection(final String quorum, final int 
clientPort, Properties props) throws SQLException {
 Preconditions.checkNotNull(quorum);
-return DriverManager.getConnection(QueryUtil.getUrl(quorum), props);
+return DriverManager.getConnection(QueryUtil.getUrl(quorum, 
clientPort), props);
 }
 
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f17e2677/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
index 6e0e5e4..bba96ac 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
@@ -94,6 +94,8 @@ public final class PhoenixConfigurationUtil {
 public static final String MAPREDUCE_INPUT_CLUSTER_QUORUM = 
phoenix.mapreduce.input.cluster.quorum;
 
 public static final String MAPREDUCE_OUTPUT_CLUSTER_QUORUM = 
phoneix.mapreduce.output.cluster.quorum;
+
+public static final String HBASE_ZOOKEEPER_CLIENT_PORT = 
hbase.zookeeper.property.clientPort;
 
 public enum SchemaType {
 TABLE,
@@ -363,6 +365,16 @@ public final class PhoenixConfigurationUtil {
 }
 return quorum;
 }
+
+/**
+ * Returns the HBase Client Port
+ * @param configuration
+ * @return
+ */
+public static int getClientPort(final Configuration configuration) {
+Preconditions.checkNotNull(configuration);
+return 
Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+}

phoenix git commit: PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps (Mujtaba Chohan)

2015-07-07 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 446b4c08f - 69a2948ac


PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from 
starting up in client apps (Mujtaba Chohan)


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/69a2948a
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/69a2948a
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/69a2948a

Branch: refs/heads/4.x-HBase-0.98
Commit: 69a2948acfd49cfd984bb824961f56bf15525905
Parents: 446b4c0
Author: Thomas D'Silva tdsi...@salesforce.com
Authored: Tue Jul 7 13:40:18 2015 -0700
Committer: Thomas D'Silva tdsi...@salesforce.com
Committed: Tue Jul 7 13:45:55 2015 -0700

--
 .../apache/phoenix/mapreduce/util/ConnectionUtil.java   |  9 +
 .../mapreduce/util/PhoenixConfigurationUtil.java| 12 
 2 files changed, 17 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/69a2948a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
index 294d4e9..000ce59 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
@@ -54,7 +54,7 @@ public class ConnectionUtil {
  */
 public static Connection getInputConnection(final Configuration conf , 
final Properties props) throws SQLException {
 Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getInputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getInputCluster(conf), 
PhoenixConfigurationUtil.getClientPort(conf),
 PropertiesUtil.extractProperties(props, conf));
 }
 
@@ -77,7 +77,7 @@ public class ConnectionUtil {
  */
 public static Connection getOutputConnection(final Configuration conf, 
Properties props) throws SQLException {
 Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf), 
PhoenixConfigurationUtil.getClientPort(conf),
 PropertiesUtil.extractProperties(props, conf));
 }
 
@@ -85,11 +85,12 @@ public class ConnectionUtil {
  * Returns the {@link Connection} from a ZooKeeper cluster string.
  *
  * @param quorum a ZooKeeper quorum connection string
+ * @param clientPort a ZooKeeper client port
  * @return a Phoenix connection to the given connection string
  */
-private static Connection getConnection(final String quorum, Properties 
props) throws SQLException {
+private static Connection getConnection(final String quorum, final int 
clientPort, Properties props) throws SQLException {
 Preconditions.checkNotNull(quorum);
-return DriverManager.getConnection(QueryUtil.getUrl(quorum), props);
+return DriverManager.getConnection(QueryUtil.getUrl(quorum, 
clientPort), props);
 }
 
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/69a2948a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
index 6e0e5e4..bba96ac 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
@@ -94,6 +94,8 @@ public final class PhoenixConfigurationUtil {
 public static final String MAPREDUCE_INPUT_CLUSTER_QUORUM = 
phoenix.mapreduce.input.cluster.quorum;
 
 public static final String MAPREDUCE_OUTPUT_CLUSTER_QUORUM = 
phoneix.mapreduce.output.cluster.quorum;
+
+public static final String HBASE_ZOOKEEPER_CLIENT_PORT = 
hbase.zookeeper.property.clientPort;
 
 public enum SchemaType {
 TABLE,
@@ -363,6 +365,16 @@ public final class PhoenixConfigurationUtil {
 }
 return quorum;
 }
+
+/**
+ * Returns the HBase Client Port
+ * @param configuration
+ * @return
+ */
+public static int getClientPort(final Configuration configuration) {
+Preconditions.checkNotNull(configuration);
+return 
Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+}