git commit: PHOENIX-1284 Override config properties for unit tests not making it to server

2014-09-23 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/3.0 15a54d557 - f4eb0cdf8


PHOENIX-1284 Override config properties for unit tests not making it to server


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f4eb0cdf
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f4eb0cdf
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f4eb0cdf

Branch: refs/heads/3.0
Commit: f4eb0cdf88f8e408562dffcd104e3a10ad1e
Parents: 15a54d5
Author: James Taylor jtay...@salesforce.com
Authored: Tue Sep 23 01:23:54 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Sep 23 01:23:54 2014 -0700

--
 .../end2end/BaseClientManagedTimeIT.java| 31 +-
 .../phoenix/end2end/BaseHBaseManagedTimeIT.java | 31 +-
 .../BaseParallelIteratorsRegionSplitterIT.java  |  2 +-
 .../org/apache/phoenix/end2end/BaseQueryIT.java |  2 +-
 .../org/apache/phoenix/end2end/BaseViewIT.java  |  2 +-
 .../org/apache/phoenix/end2end/HashJoinIT.java  |  2 +-
 .../phoenix/end2end/InMemoryOrderByIT.java  |  2 +-
 .../org/apache/phoenix/end2end/QueryPlanIT.java |  2 +-
 .../org/apache/phoenix/end2end/SequenceIT.java  |  2 +-
 ...ipRangeParallelIteratorRegionSplitterIT.java |  2 +-
 .../end2end/SkipScanAfterManualSplitIT.java |  2 +-
 .../phoenix/end2end/SpillableGroupByIT.java |  2 +-
 .../phoenix/end2end/SpooledOrderByIT.java   |  2 +-
 .../apache/phoenix/end2end/UpsertSelectIT.java  |  2 +-
 .../phoenix/end2end/index/DropViewIT.java   |  2 +-
 .../phoenix/end2end/index/MutableIndexIT.java   |  2 +-
 .../phoenix/end2end/index/SaltedIndexIT.java| 26 +++-
 .../java/org/apache/phoenix/query/BaseTest.java | 62 
 18 files changed, 75 insertions(+), 103 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f4eb0cdf/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
index 8b47e11..2f60ea1 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
@@ -24,9 +24,6 @@ import java.sql.Date;
 import javax.annotation.concurrent.NotThreadSafe;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver;
-import org.apache.phoenix.jdbc.PhoenixTestDriver;
 import org.apache.phoenix.query.BaseTest;
 import org.apache.phoenix.util.ReadOnlyProps;
 import org.junit.After;
@@ -50,15 +47,6 @@ import org.junit.experimental.categories.Category;
 @NotThreadSafe
 @Category(ClientManagedTimeTest.class)
 public abstract class BaseClientManagedTimeIT extends BaseTest {
-private static String url;
-protected static PhoenixTestDriver driver;
-protected static final Configuration config = HBaseConfiguration.create(); 
-private static boolean clusterInitialized = false;
-
-protected final static String getUrl() {
-return checkClusterInitialized();
-}
-
 protected static Configuration getTestClusterConfig() {
 // don't want callers to modify config.
 return new Configuration(config);
@@ -72,24 +60,7 @@ public abstract class BaseClientManagedTimeIT extends 
BaseTest {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-setUpTestDriver(getUrl(), ReadOnlyProps.EMPTY_PROPS);
-}
-
-protected static void setUpTestDriver(String url, ReadOnlyProps props) 
throws Exception {
-if (PhoenixEmbeddedDriver.isTestUrl(url)) {
-checkClusterInitialized();
-if (driver == null) {
-driver = initAndRegisterDriver(url, props);
-}
-}
-}
-
-private static String checkClusterInitialized() {
-if (!clusterInitialized) {
-url = setUpTestCluster(config);
-clusterInitialized = true;
-}
-return url;
+setUpTestDriver(ReadOnlyProps.EMPTY_PROPS);
 }
 
 @AfterClass

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f4eb0cdf/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
index 047afb8..1d0f004 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
+++ 

[2/2] git commit: PHOENIX-1284 Override config properties for unit tests not making it to server

2014-09-23 Thread jamestaylor
PHOENIX-1284 Override config properties for unit tests not making it to server

Conflicts:

phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java

phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/53e2195d
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/53e2195d
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/53e2195d

Branch: refs/heads/4.0
Commit: 53e2195ddf7be5b0606f7338a8fb418bd81a93a1
Parents: 768b9d2
Author: James Taylor jtay...@salesforce.com
Authored: Tue Sep 23 01:23:54 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Sep 23 01:40:35 2014 -0700

--
 .../end2end/BaseClientManagedTimeIT.java| 31 +-
 .../phoenix/end2end/BaseHBaseManagedTimeIT.java | 31 +-
 .../BaseParallelIteratorsRegionSplitterIT.java  |  2 +-
 .../org/apache/phoenix/end2end/BaseQueryIT.java |  2 +-
 .../org/apache/phoenix/end2end/BaseViewIT.java  |  2 +-
 .../org/apache/phoenix/end2end/HashJoinIT.java  |  2 +-
 .../phoenix/end2end/InMemoryOrderByIT.java  |  2 +-
 .../org/apache/phoenix/end2end/QueryPlanIT.java |  2 +-
 .../org/apache/phoenix/end2end/SequenceIT.java  |  2 +-
 ...ipRangeParallelIteratorRegionSplitterIT.java |  2 +-
 .../end2end/SkipScanAfterManualSplitIT.java |  2 +-
 .../phoenix/end2end/SpillableGroupByIT.java |  2 +-
 .../phoenix/end2end/SpooledOrderByIT.java   |  2 +-
 .../apache/phoenix/end2end/UpsertSelectIT.java  |  2 +-
 .../phoenix/end2end/index/DropViewIT.java   |  2 +-
 .../phoenix/end2end/index/MutableIndexIT.java   |  3 +-
 .../phoenix/end2end/index/SaltedIndexIT.java| 17 +++---
 .../java/org/apache/phoenix/query/BaseTest.java | 62 
 18 files changed, 76 insertions(+), 94 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/53e2195d/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
index 8b47e11..2f60ea1 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
@@ -24,9 +24,6 @@ import java.sql.Date;
 import javax.annotation.concurrent.NotThreadSafe;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver;
-import org.apache.phoenix.jdbc.PhoenixTestDriver;
 import org.apache.phoenix.query.BaseTest;
 import org.apache.phoenix.util.ReadOnlyProps;
 import org.junit.After;
@@ -50,15 +47,6 @@ import org.junit.experimental.categories.Category;
 @NotThreadSafe
 @Category(ClientManagedTimeTest.class)
 public abstract class BaseClientManagedTimeIT extends BaseTest {
-private static String url;
-protected static PhoenixTestDriver driver;
-protected static final Configuration config = HBaseConfiguration.create(); 
-private static boolean clusterInitialized = false;
-
-protected final static String getUrl() {
-return checkClusterInitialized();
-}
-
 protected static Configuration getTestClusterConfig() {
 // don't want callers to modify config.
 return new Configuration(config);
@@ -72,24 +60,7 @@ public abstract class BaseClientManagedTimeIT extends 
BaseTest {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-setUpTestDriver(getUrl(), ReadOnlyProps.EMPTY_PROPS);
-}
-
-protected static void setUpTestDriver(String url, ReadOnlyProps props) 
throws Exception {
-if (PhoenixEmbeddedDriver.isTestUrl(url)) {
-checkClusterInitialized();
-if (driver == null) {
-driver = initAndRegisterDriver(url, props);
-}
-}
-}
-
-private static String checkClusterInitialized() {
-if (!clusterInitialized) {
-url = setUpTestCluster(config);
-clusterInitialized = true;
-}
-return url;
+setUpTestDriver(ReadOnlyProps.EMPTY_PROPS);
 }
 
 @AfterClass

http://git-wip-us.apache.org/repos/asf/phoenix/blob/53e2195d/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
 

[2/4] git commit: PHOENIX-1284 Override config properties for unit tests not making it to server

2014-09-23 Thread jamestaylor
PHOENIX-1284 Override config properties for unit tests not making it to server

Conflicts:

phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java

phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e4dc9cd5
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e4dc9cd5
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e4dc9cd5

Branch: refs/heads/master
Commit: e4dc9cd5914dbdcedb34dc24450e97492f858480
Parents: 614a243
Author: James Taylor jtay...@salesforce.com
Authored: Tue Sep 23 01:23:54 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Sep 23 02:33:14 2014 -0700

--
 .../end2end/BaseClientManagedTimeIT.java| 31 +-
 .../phoenix/end2end/BaseHBaseManagedTimeIT.java | 31 +-
 .../BaseParallelIteratorsRegionSplitterIT.java  |  2 +-
 .../org/apache/phoenix/end2end/BaseQueryIT.java |  2 +-
 .../org/apache/phoenix/end2end/BaseViewIT.java  |  2 +-
 .../org/apache/phoenix/end2end/HashJoinIT.java  |  2 +-
 .../phoenix/end2end/InMemoryOrderByIT.java  |  2 +-
 .../org/apache/phoenix/end2end/QueryPlanIT.java |  2 +-
 .../org/apache/phoenix/end2end/SequenceIT.java  |  2 +-
 ...ipRangeParallelIteratorRegionSplitterIT.java |  2 +-
 .../end2end/SkipScanAfterManualSplitIT.java |  2 +-
 .../phoenix/end2end/SpillableGroupByIT.java |  2 +-
 .../phoenix/end2end/SpooledOrderByIT.java   |  2 +-
 .../apache/phoenix/end2end/UpsertSelectIT.java  |  2 +-
 .../phoenix/end2end/index/DropViewIT.java   |  2 +-
 .../phoenix/end2end/index/MutableIndexIT.java   |  3 +-
 .../phoenix/end2end/index/SaltedIndexIT.java| 17 +++---
 .../java/org/apache/phoenix/query/BaseTest.java | 62 
 18 files changed, 76 insertions(+), 94 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e4dc9cd5/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
index 8b47e11..2f60ea1 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
@@ -24,9 +24,6 @@ import java.sql.Date;
 import javax.annotation.concurrent.NotThreadSafe;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver;
-import org.apache.phoenix.jdbc.PhoenixTestDriver;
 import org.apache.phoenix.query.BaseTest;
 import org.apache.phoenix.util.ReadOnlyProps;
 import org.junit.After;
@@ -50,15 +47,6 @@ import org.junit.experimental.categories.Category;
 @NotThreadSafe
 @Category(ClientManagedTimeTest.class)
 public abstract class BaseClientManagedTimeIT extends BaseTest {
-private static String url;
-protected static PhoenixTestDriver driver;
-protected static final Configuration config = HBaseConfiguration.create(); 
-private static boolean clusterInitialized = false;
-
-protected final static String getUrl() {
-return checkClusterInitialized();
-}
-
 protected static Configuration getTestClusterConfig() {
 // don't want callers to modify config.
 return new Configuration(config);
@@ -72,24 +60,7 @@ public abstract class BaseClientManagedTimeIT extends 
BaseTest {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-setUpTestDriver(getUrl(), ReadOnlyProps.EMPTY_PROPS);
-}
-
-protected static void setUpTestDriver(String url, ReadOnlyProps props) 
throws Exception {
-if (PhoenixEmbeddedDriver.isTestUrl(url)) {
-checkClusterInitialized();
-if (driver == null) {
-driver = initAndRegisterDriver(url, props);
-}
-}
-}
-
-private static String checkClusterInitialized() {
-if (!clusterInitialized) {
-url = setUpTestCluster(config);
-clusterInitialized = true;
-}
-return url;
+setUpTestDriver(ReadOnlyProps.EMPTY_PROPS);
 }
 
 @AfterClass

http://git-wip-us.apache.org/repos/asf/phoenix/blob/e4dc9cd5/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
 

[4/4] git commit: PHOENIX-1284 Override config properties for unit tests not making it to server

2014-09-23 Thread jamestaylor
PHOENIX-1284 Override config properties for unit tests not making it to server


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/98078328
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/98078328
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/98078328

Branch: refs/heads/master
Commit: 98078328864ef66308f429d26e93703467e5d5b9
Parents: 2bcabf8
Author: James Taylor jtay...@salesforce.com
Authored: Tue Sep 23 02:38:57 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Sep 23 02:38:57 2014 -0700

--
 .../it/java/org/apache/phoenix/end2end/ContextClassloaderIT.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/98078328/phoenix-core/src/it/java/org/apache/phoenix/end2end/ContextClassloaderIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ContextClassloaderIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ContextClassloaderIT.java
index 1cd8ee0..7d0e1da 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ContextClassloaderIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ContextClassloaderIT.java
@@ -76,7 +76,7 @@ public class ContextClassloaderIT  extends BaseTest {
 File.createTempFile(invalid, .jar).toURI().toURL() }, 
null);
 }
 
-private static String getUrl() {
+protected static String getUrl() {
 return jdbc:phoenix:localhost: + 
hbaseTestUtil.getZkCluster().getClientPort() + ;test=true;
 }