Repository: phoenix Updated Branches: refs/heads/master 787cae5b6 -> fdb429b6c
PHOENIX-2437 Build times out intermittently Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fdb429b6 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fdb429b6 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fdb429b6 Branch: refs/heads/master Commit: fdb429b6c4d9409f3e4bd5bc9f7a0c0660bac678 Parents: 787cae5 Author: Samarth <[email protected]> Authored: Thu Nov 19 16:42:20 2015 -0800 Committer: Samarth <[email protected]> Committed: Thu Nov 19 16:42:20 2015 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/phoenix/util/QueryUtil.java | 8 -------- .../src/test/java/org/apache/phoenix/query/BaseTest.java | 11 ----------- 2 files changed, 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/fdb429b6/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 51c03fd..f275f55 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 @@ -39,7 +39,6 @@ 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.iterate.ResultIterator; -import org.apache.phoenix.jdbc.PhoenixDriver; import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver; import org.apache.phoenix.parse.HintNode; import org.apache.phoenix.parse.HintNode.Hint; @@ -304,18 +303,11 @@ public final class QueryUtil { public static String getConnectionUrl(Properties props, Configuration conf) throws ClassNotFoundException, SQLException { // TODO: props is ignored! - // make sure we load the phoenix driver - // TODO: remove this - it doesn't belong here - // The driver should be loaded outside of this call as we might - // be using the test driver. - Class.forName(PhoenixDriver.class.getName()); - // read the hbase properties from the configuration String server = ZKConfig.getZKQuorumServersString(conf); // could be a comma-separated list String[] rawServers = server.split(","); List<String> servers = new ArrayList<String>(rawServers.length); - boolean first = true; int port = -1; for (String serverPort : rawServers) { try { http://git-wip-us.apache.org/repos/asf/phoenix/blob/fdb429b6/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java index 1f9b20c..8ad4f12 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java @@ -598,17 +598,6 @@ public abstract class BaseTest { utility = new HBaseTestingUtility(conf); try { utility.startMiniCluster(NUM_SLAVES_BASE); - // add shutdown hook to kill the mini cluster - Runtime.getRuntime().addShutdownHook(new Thread() { - @Override - public void run() { - try { - if (utility != null) utility.shutdownMiniCluster(); - } catch (Exception e) { - logger.warn("Exception caught when shutting down mini cluster", e); - } - } - }); return getLocalClusterUrl(utility); } catch (Throwable t) { throw new RuntimeException(t);
