You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ma...@apache.org on 2015/07/20 19:14:38 UTC
[08/50] [abbrv] phoenix git commit: PHOENIX-2025 Phoenix-core's
hbase-default.xml prevents HBaseTestingUtility from starting up in client
apps (Mujtaba Chohan)
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 <td...@salesforce.com>
Authored: Tue Jul 7 13:40:18 2015 -0700
Committer: Thomas D'Silva <td...@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 hbase-site.xml