phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sama...@apache.org
Subject phoenix git commit: PHOENIX-2437 Build times out intermittently
Date Fri, 20 Nov 2015 02:36:12 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 42f3e52b4 -> 8fbae1d10


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/8fbae1d1
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8fbae1d1
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8fbae1d1

Branch: refs/heads/4.x-HBase-0.98
Commit: 8fbae1d101082589d8538e8adbff2ac7383a8b85
Parents: 42f3e52
Author: Samarth <samarth@apache.org>
Authored: Thu Nov 19 18:35:56 2015 -0800
Committer: Samarth <samarth@apache.org>
Committed: Thu Nov 19 18:35:56 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/8fbae1d1/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 364bef5..7c0928e 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;
@@ -305,18 +304,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/8fbae1d1/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 039d002..6ca16e2 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);


Mime
View raw message