phoenix git commit: PHOENIX-4170 Remove rebuildIndexOnFailure param from MutableIndexFailureIT

2017-09-06 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/master 64658fe5a -> 134424ebd


PHOENIX-4170 Remove rebuildIndexOnFailure param from MutableIndexFailureIT


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

Branch: refs/heads/master
Commit: 134424ebd44f730344ff5da93a6ec3f734d77d4b
Parents: 64658fe
Author: Samarth Jain 
Authored: Wed Sep 6 18:05:35 2017 -0700
Committer: Samarth Jain 
Committed: Wed Sep 6 18:05:35 2017 -0700

--
 .../end2end/index/MutableIndexFailureIT.java| 82 +++-
 1 file changed, 27 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/134424eb/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
index 1f425cf..dbac5a9 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.sql.Connection;
-import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -101,7 +100,6 @@ public class MutableIndexFailureIT extends BaseTest {
 private final String tableDDLOptions;
 private final boolean isNamespaceMapped;
 private final boolean leaveIndexActiveOnFailure;
-private final boolean rebuildIndexOnWriteFailure;
 private final boolean failRebuildTask;
 private final boolean throwIndexWriteFailure;
 private String schema = generateUniqueName();
@@ -111,12 +109,11 @@ public class MutableIndexFailureIT extends BaseTest {
 private static final int disableTimestampThresholdMs = 1;
 private static final int numRpcRetries = 2;
 
-public MutableIndexFailureIT(boolean transactional, boolean localIndex, 
boolean isNamespaceMapped, Boolean disableIndexOnWriteFailure, Boolean 
rebuildIndexOnWriteFailure, boolean failRebuildTask, Boolean 
throwIndexWriteFailure) {
+public MutableIndexFailureIT(boolean transactional, boolean localIndex, 
boolean isNamespaceMapped, Boolean disableIndexOnWriteFailure, boolean 
failRebuildTask, Boolean throwIndexWriteFailure) {
 this.transactional = transactional;
 this.localIndex = localIndex;
 this.tableDDLOptions = " SALT_BUCKETS=2 " + (transactional ? ", 
TRANSACTIONAL=true " : "") 
 + (disableIndexOnWriteFailure == null ? "" : (", " + 
PhoenixIndexFailurePolicy.DISABLE_INDEX_ON_WRITE_FAILURE + "=" + 
disableIndexOnWriteFailure))
-+ (rebuildIndexOnWriteFailure == null ? "" : (", " + 
PhoenixIndexFailurePolicy.REBUILD_INDEX_ON_WRITE_FAILURE + "=" + 
rebuildIndexOnWriteFailure))
 + (throwIndexWriteFailure == null ? "" : (", " + 
PhoenixIndexFailurePolicy.THROW_INDEX_WRITE_FAILURE + "=" + 
throwIndexWriteFailure));
 this.tableName = FailingRegionObserver.FAIL_TABLE_NAME;
 this.indexName = "A_" + FailingRegionObserver.FAIL_INDEX_NAME;
@@ -124,7 +121,6 @@ public class MutableIndexFailureIT extends BaseTest {
 this.fullIndexName = SchemaUtil.getTableName(schema, indexName);
 this.isNamespaceMapped = isNamespaceMapped;
 this.leaveIndexActiveOnFailure = ! (disableIndexOnWriteFailure == null 
? QueryServicesOptions.DEFAULT_INDEX_FAILURE_DISABLE_INDEX : 
disableIndexOnWriteFailure);
-this.rebuildIndexOnWriteFailure = ! 
Boolean.FALSE.equals(rebuildIndexOnWriteFailure);
 this.failRebuildTask = failRebuildTask;
 this.throwIndexWriteFailure = ! 
Boolean.FALSE.equals(throwIndexWriteFailure);
 }
@@ -161,31 +157,31 @@ public class MutableIndexFailureIT extends BaseTest {
 indexRebuildTaskRegionEnvironment.getConfiguration());
 }
 
-@Parameters(name = 
"MutableIndexFailureIT_transactional={0},localIndex={1},isNamespaceMapped={2},disableIndexOnWriteFailure={3},rebuildIndexOnWriteFailure={4},failRebuildTask={5},throwIndexWriteFailure={6}")
 // name is used by failsafe as file name in reports
+@Parameters(name = 
"MutableIndexFailureIT_transactional={0},localIndex={1},isNamespaceMapped={2},disableIndexOnWriteFailure={3},failRebuildTask={4},throwIndexWriteFailure={5}")
 // name is used by failsafe as file name in reports
 public static List

phoenix git commit: PHOENIX-4170 Remove rebuildIndexOnFailure param from MutableIndexFailureIT

2017-09-06 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 20aaf633c -> 455a51de7


PHOENIX-4170 Remove rebuildIndexOnFailure param from MutableIndexFailureIT


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 455a51de7c6e3070da576305f40efa9039db28f9
Parents: 20aaf63
Author: Samarth Jain 
Authored: Wed Sep 6 18:04:25 2017 -0700
Committer: Samarth Jain 
Committed: Wed Sep 6 18:04:25 2017 -0700

--
 .../end2end/index/MutableIndexFailureIT.java| 46 
 1 file changed, 19 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/455a51de/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
index 462916e..a24e93f 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
@@ -101,7 +101,6 @@ public class MutableIndexFailureIT extends BaseTest {
 private final String tableDDLOptions;
 private final boolean isNamespaceMapped;
 private final boolean leaveIndexActiveOnFailure;
-private final boolean rebuildIndexOnWriteFailure;
 private final boolean failRebuildTask;
 private final boolean throwIndexWriteFailure;
 private String schema = generateUniqueName();
@@ -111,12 +110,11 @@ public class MutableIndexFailureIT extends BaseTest {
 private static final int disableTimestampThresholdMs = 1;
 private static final int numRpcRetries = 2;
 
-public MutableIndexFailureIT(boolean transactional, boolean localIndex, 
boolean isNamespaceMapped, Boolean disableIndexOnWriteFailure, Boolean 
rebuildIndexOnWriteFailure, boolean failRebuildTask, Boolean 
throwIndexWriteFailure) {
+public MutableIndexFailureIT(boolean transactional, boolean localIndex, 
boolean isNamespaceMapped, Boolean disableIndexOnWriteFailure, boolean 
failRebuildTask, Boolean throwIndexWriteFailure) {
 this.transactional = transactional;
 this.localIndex = localIndex;
 this.tableDDLOptions = " SALT_BUCKETS=2 " + (transactional ? ", 
TRANSACTIONAL=true " : "") 
 + (disableIndexOnWriteFailure == null ? "" : (", " + 
PhoenixIndexFailurePolicy.DISABLE_INDEX_ON_WRITE_FAILURE + "=" + 
disableIndexOnWriteFailure))
-+ (rebuildIndexOnWriteFailure == null ? "" : (", " + 
PhoenixIndexFailurePolicy.REBUILD_INDEX_ON_WRITE_FAILURE + "=" + 
rebuildIndexOnWriteFailure))
 + (throwIndexWriteFailure == null ? "" : (", " + 
PhoenixIndexFailurePolicy.THROW_INDEX_WRITE_FAILURE + "=" + 
throwIndexWriteFailure));
 this.tableName = FailingRegionObserver.FAIL_TABLE_NAME;
 this.indexName = "A_" + FailingRegionObserver.FAIL_INDEX_NAME;
@@ -124,7 +122,6 @@ public class MutableIndexFailureIT extends BaseTest {
 this.fullIndexName = SchemaUtil.getTableName(schema, indexName);
 this.isNamespaceMapped = isNamespaceMapped;
 this.leaveIndexActiveOnFailure = ! (disableIndexOnWriteFailure == null 
? QueryServicesOptions.DEFAULT_INDEX_FAILURE_DISABLE_INDEX : 
disableIndexOnWriteFailure);
-this.rebuildIndexOnWriteFailure = ! 
Boolean.FALSE.equals(rebuildIndexOnWriteFailure);
 this.failRebuildTask = failRebuildTask;
 this.throwIndexWriteFailure = ! 
Boolean.FALSE.equals(throwIndexWriteFailure);
 }
@@ -161,13 +158,13 @@ public class MutableIndexFailureIT extends BaseTest {
 indexRebuildTaskRegionEnvironment.getConfiguration());
 }
 
-@Parameters(name = 
"MutableIndexFailureIT_transactional={0},localIndex={1},isNamespaceMapped={2},disableIndexOnWriteFailure={3},rebuildIndexOnWriteFailure={4},failRebuildTask={5},throwIndexWriteFailure={6}")
 // name is used by failsafe as file name in reports
+@Parameters(name = 
"MutableIndexFailureIT_transactional={0},localIndex={1},isNamespaceMapped={2},disableIndexOnWriteFailure={3},failRebuildTask={4},throwIndexWriteFailure={5}")
 // name is used by failsafe as file name in reports
 public static List data() {
 return Arrays.asList(new Object[][] { 
-{ false, false, false, true, true, false, false},
-{ false, false, true, true, true, false, null},
-{ false, false, true, true, true,

phoenix git commit: PHOENIX-4170 Remove rebuildIndexOnFailure param from MutableIndexFailureIT

2017-09-06 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 37150ecfd -> 59ede02af


PHOENIX-4170 Remove rebuildIndexOnFailure param from MutableIndexFailureIT


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

Branch: refs/heads/4.x-HBase-1.2
Commit: 59ede02af93830b46d84ec9f2cd35ec66c359482
Parents: 37150ec
Author: Samarth Jain 
Authored: Wed Sep 6 17:58:13 2017 -0700
Committer: Samarth Jain 
Committed: Wed Sep 6 17:58:13 2017 -0700

--
 .../end2end/index/MutableIndexFailureIT.java| 82 +++-
 1 file changed, 27 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/59ede02a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
index ee6f6e5..5f8500d 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.sql.Connection;
-import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -101,7 +100,6 @@ public class MutableIndexFailureIT extends BaseTest {
 private final String tableDDLOptions;
 private final boolean isNamespaceMapped;
 private final boolean leaveIndexActiveOnFailure;
-private final boolean rebuildIndexOnWriteFailure;
 private final boolean failRebuildTask;
 private final boolean throwIndexWriteFailure;
 private String schema = generateUniqueName();
@@ -111,12 +109,11 @@ public class MutableIndexFailureIT extends BaseTest {
 private static final int disableTimestampThresholdMs = 1;
 private static final int numRpcRetries = 2;
 
-public MutableIndexFailureIT(boolean transactional, boolean localIndex, 
boolean isNamespaceMapped, Boolean disableIndexOnWriteFailure, Boolean 
rebuildIndexOnWriteFailure, boolean failRebuildTask, Boolean 
throwIndexWriteFailure) {
+public MutableIndexFailureIT(boolean transactional, boolean localIndex, 
boolean isNamespaceMapped, Boolean disableIndexOnWriteFailure, boolean 
failRebuildTask, Boolean throwIndexWriteFailure) {
 this.transactional = transactional;
 this.localIndex = localIndex;
 this.tableDDLOptions = " SALT_BUCKETS=2 " + (transactional ? ", 
TRANSACTIONAL=true " : "") 
 + (disableIndexOnWriteFailure == null ? "" : (", " + 
PhoenixIndexFailurePolicy.DISABLE_INDEX_ON_WRITE_FAILURE + "=" + 
disableIndexOnWriteFailure))
-+ (rebuildIndexOnWriteFailure == null ? "" : (", " + 
PhoenixIndexFailurePolicy.REBUILD_INDEX_ON_WRITE_FAILURE + "=" + 
rebuildIndexOnWriteFailure))
 + (throwIndexWriteFailure == null ? "" : (", " + 
PhoenixIndexFailurePolicy.THROW_INDEX_WRITE_FAILURE + "=" + 
throwIndexWriteFailure));
 this.tableName = FailingRegionObserver.FAIL_TABLE_NAME;
 this.indexName = "A_" + FailingRegionObserver.FAIL_INDEX_NAME;
@@ -124,7 +121,6 @@ public class MutableIndexFailureIT extends BaseTest {
 this.fullIndexName = SchemaUtil.getTableName(schema, indexName);
 this.isNamespaceMapped = isNamespaceMapped;
 this.leaveIndexActiveOnFailure = ! (disableIndexOnWriteFailure == null 
? QueryServicesOptions.DEFAULT_INDEX_FAILURE_DISABLE_INDEX : 
disableIndexOnWriteFailure);
-this.rebuildIndexOnWriteFailure = ! 
Boolean.FALSE.equals(rebuildIndexOnWriteFailure);
 this.failRebuildTask = failRebuildTask;
 this.throwIndexWriteFailure = ! 
Boolean.FALSE.equals(throwIndexWriteFailure);
 }
@@ -161,31 +157,31 @@ public class MutableIndexFailureIT extends BaseTest {
 indexRebuildTaskRegionEnvironment.getConfiguration());
 }
 
-@Parameters(name = 
"MutableIndexFailureIT_transactional={0},localIndex={1},isNamespaceMapped={2},disableIndexOnWriteFailure={3},rebuildIndexOnWriteFailure={4},failRebuildTask={5},throwIndexWriteFailure={6}")
 // name is used by failsafe as file name in reports
+@Parameters(name = 
"MutableIndexFailureIT_transactional={0},localIndex={1},isNamespaceMapped={2},disableIndexOnWriteFailure={3},failRebuildTask={4},throwIndexWriteFailure={5}")
 // name is used by failsafe as file name in reports
 public static

phoenix git commit: PHOENIX-4170 Remove rebuildIndexOnFailure param from MutableIndexFailureIT

2017-09-06 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 9296254e2 -> c63155661


PHOENIX-4170 Remove rebuildIndexOnFailure param from MutableIndexFailureIT


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

Branch: refs/heads/4.x-HBase-1.1
Commit: c63155661e8f9f198f0f3833fb829ca4dfdadd75
Parents: 9296254
Author: Samarth Jain 
Authored: Wed Sep 6 17:58:45 2017 -0700
Committer: Samarth Jain 
Committed: Wed Sep 6 17:58:45 2017 -0700

--
 .../end2end/index/MutableIndexFailureIT.java| 82 +++-
 1 file changed, 27 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c6315566/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
index 5797819..199957a 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.sql.Connection;
-import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -103,7 +102,6 @@ public class MutableIndexFailureIT extends BaseTest {
 private final String tableDDLOptions;
 private final boolean isNamespaceMapped;
 private final boolean leaveIndexActiveOnFailure;
-private final boolean rebuildIndexOnWriteFailure;
 private final boolean failRebuildTask;
 private final boolean throwIndexWriteFailure;
 private String schema = generateUniqueName();
@@ -113,12 +111,11 @@ public class MutableIndexFailureIT extends BaseTest {
 private static final int disableTimestampThresholdMs = 1;
 private static final int numRpcRetries = 2;
 
-public MutableIndexFailureIT(boolean transactional, boolean localIndex, 
boolean isNamespaceMapped, Boolean disableIndexOnWriteFailure, Boolean 
rebuildIndexOnWriteFailure, boolean failRebuildTask, Boolean 
throwIndexWriteFailure) {
+public MutableIndexFailureIT(boolean transactional, boolean localIndex, 
boolean isNamespaceMapped, Boolean disableIndexOnWriteFailure, boolean 
failRebuildTask, Boolean throwIndexWriteFailure) {
 this.transactional = transactional;
 this.localIndex = localIndex;
 this.tableDDLOptions = " SALT_BUCKETS=2 " + (transactional ? ", 
TRANSACTIONAL=true " : "") 
 + (disableIndexOnWriteFailure == null ? "" : (", " + 
PhoenixIndexFailurePolicy.DISABLE_INDEX_ON_WRITE_FAILURE + "=" + 
disableIndexOnWriteFailure))
-+ (rebuildIndexOnWriteFailure == null ? "" : (", " + 
PhoenixIndexFailurePolicy.REBUILD_INDEX_ON_WRITE_FAILURE + "=" + 
rebuildIndexOnWriteFailure))
 + (throwIndexWriteFailure == null ? "" : (", " + 
PhoenixIndexFailurePolicy.THROW_INDEX_WRITE_FAILURE + "=" + 
throwIndexWriteFailure));
 this.tableName = FailingRegionObserver.FAIL_TABLE_NAME;
 this.indexName = "A_" + FailingRegionObserver.FAIL_INDEX_NAME;
@@ -126,7 +123,6 @@ public class MutableIndexFailureIT extends BaseTest {
 this.fullIndexName = SchemaUtil.getTableName(schema, indexName);
 this.isNamespaceMapped = isNamespaceMapped;
 this.leaveIndexActiveOnFailure = ! (disableIndexOnWriteFailure == null 
? QueryServicesOptions.DEFAULT_INDEX_FAILURE_DISABLE_INDEX : 
disableIndexOnWriteFailure);
-this.rebuildIndexOnWriteFailure = ! 
Boolean.FALSE.equals(rebuildIndexOnWriteFailure);
 this.failRebuildTask = failRebuildTask;
 this.throwIndexWriteFailure = ! 
Boolean.FALSE.equals(throwIndexWriteFailure);
 }
@@ -163,31 +159,31 @@ public class MutableIndexFailureIT extends BaseTest {
 indexRebuildTaskRegionEnvironment.getConfiguration());
 }
 
-@Parameters(name = 
"MutableIndexFailureIT_transactional={0},localIndex={1},isNamespaceMapped={2},disableIndexOnWriteFailure={3},rebuildIndexOnWriteFailure={4},failRebuildTask={5},throwIndexWriteFailure={6}")
 // name is used by failsafe as file name in reports
+@Parameters(name = 
"MutableIndexFailureIT_transactional={0},localIndex={1},isNamespaceMapped={2},disableIndexOnWriteFailure={3},failRebuildTask={4},throwIndexWriteFailure={5}")
 // name is used by failsafe as file name in reports
 public static

phoenix git commit: PHOENIX-4170 Remove rebuildIndexOnFailure param from MutableIndexFailureIT

2017-09-06 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/master ad52201e0 -> dd5642ff5


PHOENIX-4170 Remove rebuildIndexOnFailure param from MutableIndexFailureIT


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

Branch: refs/heads/master
Commit: dd5642ff55cbc829765114d0be051cb48081e4a6
Parents: ad52201
Author: Samarth Jain 
Authored: Wed Sep 6 17:54:01 2017 -0700
Committer: Samarth Jain 
Committed: Wed Sep 6 17:54:01 2017 -0700

--
 .../end2end/BaseClientManagedTimeIT.java|  2 +-
 .../phoenix/end2end/BaseHBaseManagedTimeIT.java |  2 +-
 .../org/apache/phoenix/end2end/NotQueryIT.java  |  1 -
 .../end2end/ParallelStatsDisabledIT.java|  2 +-
 .../phoenix/end2end/ParallelStatsEnabledIT.java |  2 +-
 .../end2end/index/MutableIndexFailureIT.java| 82 +++-
 .../apache/phoenix/rpc/PhoenixServerRpcIT.java  |  5 +-
 .../phoenix/query/QueryServicesOptions.java |  4 +-
 .../java/org/apache/phoenix/query/BaseTest.java | 73 +
 9 files changed, 75 insertions(+), 98 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/dd5642ff/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 dee7200..ee038e6 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
@@ -74,6 +74,6 @@ public abstract class BaseClientManagedTimeIT extends 
BaseTest {
 
 @AfterClass
 public static void doTeardown() throws Exception {
-dropNonSystemTables();
+dropNonSystemTables(true);
 }
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/dd5642ff/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 7439b1d..367eb22 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
@@ -59,7 +59,7 @@ public abstract class BaseHBaseManagedTimeIT extends BaseTest 
{
 
 @AfterClass
 public static void doTeardown() throws Exception {
-dropNonSystemTables();
+dropNonSystemTables(true);
 }
 
 @After

http://git-wip-us.apache.org/repos/asf/phoenix/blob/dd5642ff/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
index 9a285ff..148d14f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
@@ -38,7 +38,6 @@ import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Properties;
 
-import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/dd5642ff/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledIT.java
index fb980a3..0a1fbd8 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledIT.java
@@ -39,6 +39,6 @@ public abstract class ParallelStatsDisabledIT extends 
BaseTest {
 
 @AfterClass
 public static void tearDownMiniCluster() throws Exception {
-BaseTest.tearDownMiniClusterIfBeyondThreshold();
+BaseTest.dropNonSystemTables(false);
 }
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/dd5642ff/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java