You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ra...@apache.org on 2015/07/08 07:15:53 UTC
[1/6] phoenix git commit: PHOENIX-2025 - Phoenix-core's
hbase-default.xml prevents HBaseTestingUtility from starting up in client
apps (Thomas D'Silva)
Repository: phoenix
Updated Branches:
refs/heads/4.4-HBase-0.98 60b3ea369 -> 65404078d
refs/heads/4.4-HBase-1.0 cac6d5767 -> b3d1f12ff
refs/heads/4.4-HBase-1.1 5a6b9967b -> 3c6b6ac36
refs/heads/4.x-HBase-0.98 69a2948ac -> b82c5cbcc
refs/heads/4.x-HBase-1.0 f17e26775 -> 926b31605
refs/heads/master dee7a02f9 -> 973bccb70
PHOENIX-2025 - Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps (Thomas D'Silva)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/973bccb7
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/973bccb7
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/973bccb7
Branch: refs/heads/master
Commit: 973bccb7019bfb0c15a9fd5259d7b01f37859b52
Parents: dee7a02
Author: ravimagham <ra...@apache.org>
Authored: Tue Jul 7 22:10:59 2015 -0700
Committer: ravimagham <ra...@apache.org>
Committed: Tue Jul 7 22:10:59 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java | 4 ++--
.../phoenix/mapreduce/util/PhoenixConfigurationUtil.java | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/973bccb7/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 000ce59..b4724d8 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
@@ -88,9 +88,9 @@ public class ConnectionUtil {
* @param clientPort a ZooKeeper client port
* @return a Phoenix connection to the given connection string
*/
- private static Connection getConnection(final String quorum, final int clientPort, Properties props) throws SQLException {
+ private static Connection getConnection(final String quorum, final Integer clientPort, Properties props) throws SQLException {
Preconditions.checkNotNull(quorum);
- return DriverManager.getConnection(QueryUtil.getUrl(quorum, clientPort), props);
+ return DriverManager.getConnection(clientPort!=null? QueryUtil.getUrl(quorum, clientPort) : QueryUtil.getUrl(quorum), props);
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/973bccb7/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 bba96ac..e26f988 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
@@ -27,6 +27,7 @@ import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -371,9 +372,10 @@ public final class PhoenixConfigurationUtil {
* @param configuration
* @return
*/
- public static int getClientPort(final Configuration configuration) {
+ public static Integer getClientPort(final Configuration configuration) {
Preconditions.checkNotNull(configuration);
- return Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+ String clientPortString = configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT);
+ return clientPortString==null ? null : Integer.parseInt(clientPortString);
}
public static void loadHBaseConfiguration(Job job) throws IOException {
[5/6] phoenix git commit: PHOENIX-2025 - Phoenix-core's
hbase-default.xml prevents HBaseTestingUtility from starting up in client
apps - (Thomas D'Silva)
Posted by ra...@apache.org.
PHOENIX-2025 - Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps - (Thomas D'Silva)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b82c5cbc
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b82c5cbc
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b82c5cbc
Branch: refs/heads/4.x-HBase-0.98
Commit: b82c5cbccdf4eb944238e69a514841be361bfb6d
Parents: 69a2948
Author: ravimagham <ra...@apache.org>
Authored: Tue Jul 7 22:15:07 2015 -0700
Committer: ravimagham <ra...@apache.org>
Committed: Tue Jul 7 22:15:07 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java | 4 ++--
.../phoenix/mapreduce/util/PhoenixConfigurationUtil.java | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b82c5cbc/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 000ce59..b4724d8 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
@@ -88,9 +88,9 @@ public class ConnectionUtil {
* @param clientPort a ZooKeeper client port
* @return a Phoenix connection to the given connection string
*/
- private static Connection getConnection(final String quorum, final int clientPort, Properties props) throws SQLException {
+ private static Connection getConnection(final String quorum, final Integer clientPort, Properties props) throws SQLException {
Preconditions.checkNotNull(quorum);
- return DriverManager.getConnection(QueryUtil.getUrl(quorum, clientPort), props);
+ return DriverManager.getConnection(clientPort!=null? QueryUtil.getUrl(quorum, clientPort) : QueryUtil.getUrl(quorum), props);
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b82c5cbc/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 bba96ac..e26f988 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
@@ -27,6 +27,7 @@ import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -371,9 +372,10 @@ public final class PhoenixConfigurationUtil {
* @param configuration
* @return
*/
- public static int getClientPort(final Configuration configuration) {
+ public static Integer getClientPort(final Configuration configuration) {
Preconditions.checkNotNull(configuration);
- return Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+ String clientPortString = configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT);
+ return clientPortString==null ? null : Integer.parseInt(clientPortString);
}
public static void loadHBaseConfiguration(Job job) throws IOException {
[3/6] phoenix git commit: PHOENIX-2025 - Phoenix-core's
hbase-default.xml prevents HBaseTestingUtility from starting up in client
apps - (Thomas D'Silva)
Posted by ra...@apache.org.
PHOENIX-2025 - Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps - (Thomas D'Silva)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b3d1f12f
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b3d1f12f
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b3d1f12f
Branch: refs/heads/4.4-HBase-1.0
Commit: b3d1f12ff7da66815e32ce6533d003320f916ac5
Parents: cac6d57
Author: ravimagham <ra...@apache.org>
Authored: Tue Jul 7 22:12:58 2015 -0700
Committer: ravimagham <ra...@apache.org>
Committed: Tue Jul 7 22:12:58 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java | 4 ++--
.../phoenix/mapreduce/util/PhoenixConfigurationUtil.java | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b3d1f12f/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 000ce59..b4724d8 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
@@ -88,9 +88,9 @@ public class ConnectionUtil {
* @param clientPort a ZooKeeper client port
* @return a Phoenix connection to the given connection string
*/
- private static Connection getConnection(final String quorum, final int clientPort, Properties props) throws SQLException {
+ private static Connection getConnection(final String quorum, final Integer clientPort, Properties props) throws SQLException {
Preconditions.checkNotNull(quorum);
- return DriverManager.getConnection(QueryUtil.getUrl(quorum, clientPort), props);
+ return DriverManager.getConnection(clientPort!=null? QueryUtil.getUrl(quorum, clientPort) : QueryUtil.getUrl(quorum), props);
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b3d1f12f/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 bba96ac..e26f988 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
@@ -27,6 +27,7 @@ import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -371,9 +372,10 @@ public final class PhoenixConfigurationUtil {
* @param configuration
* @return
*/
- public static int getClientPort(final Configuration configuration) {
+ public static Integer getClientPort(final Configuration configuration) {
Preconditions.checkNotNull(configuration);
- return Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+ String clientPortString = configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT);
+ return clientPortString==null ? null : Integer.parseInt(clientPortString);
}
public static void loadHBaseConfiguration(Job job) throws IOException {
[4/6] phoenix git commit: PHOENIX-2025 - Phoenix-core's
hbase-default.xml prevents HBaseTestingUtility from starting up in client
apps - (Thomas D'Silva)
Posted by ra...@apache.org.
PHOENIX-2025 - Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps - (Thomas D'Silva)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3c6b6ac3
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3c6b6ac3
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3c6b6ac3
Branch: refs/heads/4.4-HBase-1.1
Commit: 3c6b6ac36af759320baee20fe833e19feff67b25
Parents: 5a6b996
Author: ravimagham <ra...@apache.org>
Authored: Tue Jul 7 22:13:42 2015 -0700
Committer: ravimagham <ra...@apache.org>
Committed: Tue Jul 7 22:13:42 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java | 4 ++--
.../phoenix/mapreduce/util/PhoenixConfigurationUtil.java | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/3c6b6ac3/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 000ce59..b4724d8 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
@@ -88,9 +88,9 @@ public class ConnectionUtil {
* @param clientPort a ZooKeeper client port
* @return a Phoenix connection to the given connection string
*/
- private static Connection getConnection(final String quorum, final int clientPort, Properties props) throws SQLException {
+ private static Connection getConnection(final String quorum, final Integer clientPort, Properties props) throws SQLException {
Preconditions.checkNotNull(quorum);
- return DriverManager.getConnection(QueryUtil.getUrl(quorum, clientPort), props);
+ return DriverManager.getConnection(clientPort!=null? QueryUtil.getUrl(quorum, clientPort) : QueryUtil.getUrl(quorum), props);
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/3c6b6ac3/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 bba96ac..e26f988 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
@@ -27,6 +27,7 @@ import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -371,9 +372,10 @@ public final class PhoenixConfigurationUtil {
* @param configuration
* @return
*/
- public static int getClientPort(final Configuration configuration) {
+ public static Integer getClientPort(final Configuration configuration) {
Preconditions.checkNotNull(configuration);
- return Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+ String clientPortString = configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT);
+ return clientPortString==null ? null : Integer.parseInt(clientPortString);
}
public static void loadHBaseConfiguration(Job job) throws IOException {
[2/6] phoenix git commit: PHOENIX-2025 - Phoenix-core's
hbase-default.xml prevents HBaseTestingUtility from starting up in client
apps - (Thomas D'Silva)
Posted by ra...@apache.org.
PHOENIX-2025 - Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps - (Thomas D'Silva)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/65404078
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/65404078
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/65404078
Branch: refs/heads/4.4-HBase-0.98
Commit: 65404078d8e20d08cfcac78e5401f1dd8c28339c
Parents: 60b3ea3
Author: ravimagham <ra...@apache.org>
Authored: Tue Jul 7 22:11:51 2015 -0700
Committer: ravimagham <ra...@apache.org>
Committed: Tue Jul 7 22:11:51 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java | 4 ++--
.../phoenix/mapreduce/util/PhoenixConfigurationUtil.java | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/65404078/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 000ce59..b4724d8 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
@@ -88,9 +88,9 @@ public class ConnectionUtil {
* @param clientPort a ZooKeeper client port
* @return a Phoenix connection to the given connection string
*/
- private static Connection getConnection(final String quorum, final int clientPort, Properties props) throws SQLException {
+ private static Connection getConnection(final String quorum, final Integer clientPort, Properties props) throws SQLException {
Preconditions.checkNotNull(quorum);
- return DriverManager.getConnection(QueryUtil.getUrl(quorum, clientPort), props);
+ return DriverManager.getConnection(clientPort!=null? QueryUtil.getUrl(quorum, clientPort) : QueryUtil.getUrl(quorum), props);
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/65404078/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 bba96ac..e26f988 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
@@ -27,6 +27,7 @@ import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -371,9 +372,10 @@ public final class PhoenixConfigurationUtil {
* @param configuration
* @return
*/
- public static int getClientPort(final Configuration configuration) {
+ public static Integer getClientPort(final Configuration configuration) {
Preconditions.checkNotNull(configuration);
- return Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+ String clientPortString = configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT);
+ return clientPortString==null ? null : Integer.parseInt(clientPortString);
}
public static void loadHBaseConfiguration(Job job) throws IOException {
[6/6] phoenix git commit: PHOENIX-2025 - Phoenix-core's
hbase-default.xml prevents HBaseTestingUtility from starting up in client
apps - (Thomas D'Silva)
Posted by ra...@apache.org.
PHOENIX-2025 - Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps - (Thomas D'Silva)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/926b3160
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/926b3160
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/926b3160
Branch: refs/heads/4.x-HBase-1.0
Commit: 926b31605af78888d7c628f6f32b1959a370f3ec
Parents: f17e267
Author: ravimagham <ra...@apache.org>
Authored: Tue Jul 7 22:15:40 2015 -0700
Committer: ravimagham <ra...@apache.org>
Committed: Tue Jul 7 22:15:40 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java | 4 ++--
.../phoenix/mapreduce/util/PhoenixConfigurationUtil.java | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/926b3160/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 000ce59..b4724d8 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
@@ -88,9 +88,9 @@ public class ConnectionUtil {
* @param clientPort a ZooKeeper client port
* @return a Phoenix connection to the given connection string
*/
- private static Connection getConnection(final String quorum, final int clientPort, Properties props) throws SQLException {
+ private static Connection getConnection(final String quorum, final Integer clientPort, Properties props) throws SQLException {
Preconditions.checkNotNull(quorum);
- return DriverManager.getConnection(QueryUtil.getUrl(quorum, clientPort), props);
+ return DriverManager.getConnection(clientPort!=null? QueryUtil.getUrl(quorum, clientPort) : QueryUtil.getUrl(quorum), props);
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/926b3160/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 bba96ac..e26f988 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
@@ -27,6 +27,7 @@ import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -371,9 +372,10 @@ public final class PhoenixConfigurationUtil {
* @param configuration
* @return
*/
- public static int getClientPort(final Configuration configuration) {
+ public static Integer getClientPort(final Configuration configuration) {
Preconditions.checkNotNull(configuration);
- return Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+ String clientPortString = configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT);
+ return clientPortString==null ? null : Integer.parseInt(clientPortString);
}
public static void loadHBaseConfiguration(Job job) throws IOException {