You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by sa...@apache.org on 2016/11/22 02:54:13 UTC
[09/36] phoenix git commit: PHOENIX-3485 Addendum - Use get() instead
of getStrings() for retrieving zkquorum
PHOENIX-3485 Addendum - Use get() instead of getStrings() for retrieving zkquorum
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/da935030
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/da935030
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/da935030
Branch: refs/heads/encodecolumns2
Commit: da935030cc81cbebce2a1e1cf95cd748a2cda1cc
Parents: e0c2b03
Author: Samarth <sa...@salesforce.com>
Authored: Wed Nov 16 09:18:35 2016 -0800
Committer: Samarth <sa...@salesforce.com>
Committed: Wed Nov 16 09:18:35 2016 -0800
----------------------------------------------------------------------
.../it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java | 6 ------
.../src/main/java/org/apache/phoenix/util/QueryUtil.java | 5 ++---
2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/da935030/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
index 421f328..9103bd8 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
@@ -29,7 +29,6 @@ import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.Statement;
-import java.util.Map;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
@@ -37,18 +36,13 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.FileAlreadyExistsException;
import org.apache.phoenix.mapreduce.CsvBulkLoadTool;
-import org.apache.phoenix.query.QueryServices;
-import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.util.DateUtil;
import org.apache.phoenix.util.PhoenixRuntime;
-import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.TestUtil;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.google.common.collect.Maps;
-
public class CsvBulkLoadToolIT extends BaseOwnClusterIT {
private static Connection conn;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/da935030/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
index c8f5996..0b82857 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
@@ -347,9 +347,8 @@ public final class QueryUtil {
// read the hbase properties from the configuration
int port = conf.getInt(HConstants.ZOOKEEPER_CLIENT_PORT, HConstants.DEFAULT_ZOOKEPER_CLIENT_PORT);
// Build the ZK quorum server string with "server:clientport" list, separated by ','
- final String[] servers =
- conf.getStrings(HConstants.ZOOKEEPER_QUORUM, HConstants.LOCALHOST);
- String server = Joiner.on(',').join(servers);
+ final String server =
+ conf.get(HConstants.ZOOKEEPER_QUORUM, HConstants.LOCALHOST);
String znodeParent = conf.get(HConstants.ZOOKEEPER_ZNODE_PARENT,
HConstants.DEFAULT_ZOOKEEPER_ZNODE_PARENT);
String url = getUrl(server, port, znodeParent, principal);