Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.1 c08e994fa -> 8e9eb0118
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/8e9eb011 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8e9eb011 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8e9eb011 Branch: refs/heads/4.x-HBase-1.1 Commit: 8e9eb0118277fd5645e87190bc708a80f8047955 Parents: c08e994 Author: Samarth <[email protected]> Authored: Wed Nov 16 09:31:07 2016 -0800 Committer: Samarth <[email protected]> Committed: Wed Nov 16 09:31:07 2016 -0800 ---------------------------------------------------------------------- .../java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java | 6 ------ .../src/main/java/org/apache/phoenix/util/QueryUtil.java | 8 ++------ 2 files changed, 2 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/8e9eb011/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/8e9eb011/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 f348a26..d3886db 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 @@ -25,7 +25,6 @@ import java.sql.DatabaseMetaData; import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -37,8 +36,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; -import org.apache.hadoop.hbase.util.Addressing; -import org.apache.hadoop.hbase.zookeeper.ZKConfig; import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.apache.phoenix.iterate.ResultIterator; import org.apache.phoenix.jdbc.PhoenixConnection; @@ -349,9 +346,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);
