PHOENIX-3293 Create separate test categories for stats enabled and disabled


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 424934ee0f98dfa194038c9ba385b8cdcc48b6e7
Parents: faad4ad
Author: James Taylor <jamestay...@apache.org>
Authored: Sat Sep 17 15:20:01 2016 -0700
Committer: James Taylor <jamestay...@apache.org>
Committed: Mon Sep 19 08:02:34 2016 -0700

----------------------------------------------------------------------
 .../phoenix/end2end/AbsFunctionEnd2EndIT.java   |  2 +-
 .../AlterMultiTenantTableWithViewsIT.java       |  2 +-
 .../apache/phoenix/end2end/AlterTableIT.java    |  2 +-
 .../phoenix/end2end/AlterTableWithViewsIT.java  |  4 +-
 .../phoenix/end2end/AppendOnlySchemaIT.java     |  2 +-
 .../phoenix/end2end/ArithmeticQueryIT.java      |  2 +-
 .../phoenix/end2end/ArrayAppendFunctionIT.java  |  2 +-
 .../phoenix/end2end/ArrayConcatFunctionIT.java  |  2 +-
 .../phoenix/end2end/ArrayFillFunctionIT.java    |  2 +-
 .../phoenix/end2end/ArrayPrependFunctionIT.java |  2 +-
 .../end2end/ArrayToStringFunctionIT.java        |  2 +-
 .../phoenix/end2end/ArraysWithNullsIT.java      |  2 +-
 .../apache/phoenix/end2end/AutoCommitIT.java    |  2 +-
 .../phoenix/end2end/AutoPartitionViewsIT.java   |  2 +-
 .../BaseHBaseManagedTimeTableReuseIT.java       | 70 ------------------
 .../apache/phoenix/end2end/BaseParallelIT.java  | 69 ++++++++++++++++++
 .../end2end/BaseTenantSpecificViewIndexIT.java  |  2 +-
 .../apache/phoenix/end2end/BinaryRowKeyIT.java  |  2 +-
 .../phoenix/end2end/CSVCommonsLoaderIT.java     |  2 +-
 .../phoenix/end2end/CbrtFunctionEnd2EndIT.java  |  2 +-
 .../phoenix/end2end/CoalesceFunctionIT.java     |  2 +-
 .../end2end/ConvertTimezoneFunctionIT.java      |  2 +-
 .../org/apache/phoenix/end2end/DateTimeIT.java  |  2 +-
 .../phoenix/end2end/DecodeFunctionIT.java       |  2 +-
 .../org/apache/phoenix/end2end/DeleteIT.java    |  2 +-
 .../phoenix/end2end/DisableLocalIndexIT.java    |  4 +-
 .../phoenix/end2end/DistinctPrefixFilterIT.java |  4 +-
 .../apache/phoenix/end2end/DynamicColumnIT.java |  2 +-
 .../apache/phoenix/end2end/DynamicFamilyIT.java |  2 +-
 .../apache/phoenix/end2end/DynamicUpsertIT.java |  2 +-
 .../phoenix/end2end/EncodeFunctionIT.java       |  2 +-
 .../phoenix/end2end/EvaluationOfORIT.java       |  3 +-
 .../phoenix/end2end/ExecuteStatementsIT.java    |  2 +-
 .../phoenix/end2end/ExpFunctionEnd2EndIT.java   |  2 +-
 .../phoenix/end2end/FirstValueFunctionIT.java   |  2 +-
 .../end2end/GetSetByteBitFunctionEnd2EndIT.java |  2 +-
 .../apache/phoenix/end2end/GroupByCaseIT.java   |  2 +-
 .../end2end/HBaseManagedTimeTableReuseTest.java | 47 -------------
 .../phoenix/end2end/HBaseManagedTimeTest.java   |  2 +-
 .../apache/phoenix/end2end/HashJoinMoreIT.java  |  4 +-
 .../org/apache/phoenix/end2end/InListIT.java    |  2 +-
 .../phoenix/end2end/InMemoryOrderByIT.java      |  2 +-
 .../apache/phoenix/end2end/InstrFunctionIT.java |  2 +-
 .../org/apache/phoenix/end2end/IsNullIT.java    |  2 +-
 .../phoenix/end2end/LastValueFunctionIT.java    |  2 +-
 .../phoenix/end2end/LikeExpressionIT.java       |  2 +-
 .../phoenix/end2end/LnLogFunctionEnd2EndIT.java |  2 +-
 .../apache/phoenix/end2end/MD5FunctionIT.java   |  2 +-
 .../org/apache/phoenix/end2end/MapReduceIT.java |  2 +-
 .../phoenix/end2end/MappingTableDataTypeIT.java |  2 +-
 .../end2end/MinMaxAggregateFunctionIT.java      |  2 +-
 .../phoenix/end2end/ModulusExpressionIT.java    |  2 +-
 .../end2end/NamespaceSchemaMappingIT.java       |  2 +-
 .../phoenix/end2end/NthValueFunctionIT.java     |  2 +-
 .../end2end/OctetLengthFunctionEnd2EndIT.java   |  2 +-
 .../org/apache/phoenix/end2end/OrderByIT.java   |  2 +-
 .../end2end/ParallelStatsDisabledIT.java        | 30 ++++++++
 .../end2end/ParallelStatsDisabledTest.java      | 45 ++++++++++++
 .../phoenix/end2end/ParallelStatsEnabledIT.java | 31 ++++++++
 .../end2end/ParallelStatsEnabledTest.java       | 45 ++++++++++++
 .../apache/phoenix/end2end/PercentileIT.java    |  2 +-
 .../phoenix/end2end/PhoenixRuntimeIT.java       |  2 +-
 .../phoenix/end2end/PowerFunctionEnd2EndIT.java |  2 +-
 .../apache/phoenix/end2end/PrimitiveTypeIT.java |  2 +-
 .../phoenix/end2end/QueryExecWithoutSCNIT.java  |  2 +-
 .../org/apache/phoenix/end2end/QueryMoreIT.java |  2 +-
 .../apache/phoenix/end2end/RTrimFunctionIT.java |  2 +-
 .../org/apache/phoenix/end2end/ReadOnlyIT.java  |  2 +-
 .../end2end/RegexpReplaceFunctionIT.java        |  2 +-
 .../phoenix/end2end/RegexpSplitFunctionIT.java  |  2 +-
 .../phoenix/end2end/RegexpSubstrFunctionIT.java |  2 +-
 .../phoenix/end2end/ReverseFunctionIT.java      |  2 +-
 .../apache/phoenix/end2end/ReverseScanIT.java   |  2 +-
 .../phoenix/end2end/RoundFloorCeilFuncIT.java   |  2 +-
 .../phoenix/end2end/SerialIteratorsIT.java      |  2 +-
 .../phoenix/end2end/ServerExceptionIT.java      |  2 +-
 .../phoenix/end2end/SignFunctionEnd2EndIT.java  |  2 +-
 .../end2end/SkipScanAfterManualSplitIT.java     |  4 +-
 .../apache/phoenix/end2end/SkipScanQueryIT.java |  2 +-
 .../phoenix/end2end/SortMergeJoinMoreIT.java    |  4 +-
 .../org/apache/phoenix/end2end/SortOrderIT.java |  2 +-
 .../phoenix/end2end/SpooledTmpFileDeleteIT.java |  2 +-
 .../phoenix/end2end/SqrtFunctionEnd2EndIT.java  |  2 +-
 .../phoenix/end2end/StatementHintsIT.java       |  2 +-
 .../org/apache/phoenix/end2end/StddevIT.java    |  2 +-
 .../apache/phoenix/end2end/StoreNullsIT.java    |  2 +-
 .../org/apache/phoenix/end2end/StringIT.java    |  2 +-
 .../end2end/StringToArrayFunctionIT.java        |  2 +-
 .../apache/phoenix/end2end/TenantIdTypeIT.java  |  2 +-
 .../end2end/TimezoneOffsetFunctionIT.java       |  2 +-
 .../phoenix/end2end/ToCharFunctionIT.java       |  2 +-
 .../phoenix/end2end/ToDateFunctionIT.java       |  2 +-
 .../org/apache/phoenix/end2end/UnionAllIT.java  |  2 +-
 .../phoenix/end2end/UpsertBigValuesIT.java      |  2 +-
 .../end2end/UpsertSelectAutoCommitIT.java       |  2 +-
 .../org/apache/phoenix/end2end/UseSchemaIT.java |  2 +-
 .../end2end/index/AsyncIndexDisabledIT.java     |  4 +-
 .../index/ChildViewsUseParentViewIndexIT.java   |  4 +-
 .../phoenix/end2end/index/DropMetadataIT.java   |  6 +-
 .../index/GlobalIndexOptimizationIT.java        |  6 +-
 .../phoenix/end2end/index/ImmutableIndexIT.java |  6 +-
 .../end2end/index/IndexExpressionIT.java        |  4 +-
 .../apache/phoenix/end2end/index/IndexIT.java   |  6 +-
 .../phoenix/end2end/index/IndexMetadataIT.java  |  4 +-
 .../phoenix/end2end/index/LocalIndexIT.java     |  4 +-
 .../phoenix/end2end/index/MutableIndexIT.java   |  6 +-
 .../phoenix/end2end/index/SaltedIndexIT.java    |  6 +-
 .../phoenix/end2end/index/ViewIndexIT.java      |  4 +-
 .../end2end/index/txn/MutableRollbackIT.java    |  6 +-
 .../phoenix/end2end/index/txn/RollbackIT.java   |  6 +-
 .../salted/SaltedTableUpsertSelectIT.java       |  4 +-
 .../salted/SaltedTableVarLengthRowKeyIT.java    |  4 +-
 .../phoenix/iterate/PhoenixQueryTimeoutIT.java  |  4 +-
 .../iterate/RoundRobinResultIteratorIT.java     |  6 +-
 .../org/apache/phoenix/rpc/UpdateCacheIT.java   |  6 +-
 .../apache/phoenix/trace/BaseTracingTestIT.java |  4 +-
 .../org/apache/phoenix/tx/TransactionIT.java    |  6 +-
 .../org/apache/phoenix/tx/TxCheckpointIT.java   |  6 +-
 .../org/apache/phoenix/flume/PhoenixSinkIT.java |  4 +-
 .../phoenix/flume/RegexEventSerializerIT.java   |  4 +-
 .../apache/phoenix/pherf/ResultBaseTestIT.java  |  4 +-
 .../apache/phoenix/pherf/SchemaReaderIT.java    |  4 +-
 .../java/org/apache/phoenix/pig/BasePigIT.java  |  6 +-
 .../phoenix/end2end/QueryServerBasicsIT.java    |  2 +-
 pom.xml                                         | 74 ++++++++++++++------
 125 files changed, 434 insertions(+), 304 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
index 2aba334..2952c0c 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 /**
  * End to end tests for {@link AbsFunction}
  */
-public class AbsFunctionEnd2EndIT extends BaseHBaseManagedTimeTableReuseIT {
+public class AbsFunctionEnd2EndIT extends ParallelStatsDisabledIT {
 
     private static final String TABLE_NAME = generateRandomString();
     private static final String KEY = "key";

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
index 8ec93bc..7a4e391 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterMultiTenantTableWithViewsIT.java
@@ -54,7 +54,7 @@ import org.junit.Test;
 
 import com.google.common.base.Objects;
 
-public class AlterMultiTenantTableWithViewsIT extends 
BaseHBaseManagedTimeTableReuseIT {
+public class AlterMultiTenantTableWithViewsIT extends ParallelStatsDisabledIT {
 
     private Connection getTenantConnection(String tenantId) throws Exception {
         Properties tenantProps = new Properties();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
index 857f953..2634335 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
@@ -71,7 +71,7 @@ import org.junit.Test;
  * or at the end of test class.
  *
  */
-public class AlterTableIT extends BaseHBaseManagedTimeTableReuseIT {
+public class AlterTableIT extends ParallelStatsDisabledIT {
     private String schemaName;
     private String dataTableName;
     private String indexTableName;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
index 177a5c7..64627f1 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java
@@ -56,7 +56,7 @@ import org.junit.runners.Parameterized.Parameters;
 import com.google.common.collect.Maps;
 
 @RunWith(Parameterized.class)
-public class AlterTableWithViewsIT extends BaseHBaseManagedTimeTableReuseIT {
+public class AlterTableWithViewsIT extends ParallelStatsDisabledIT {
     
     private final boolean isMultiTenant;
     
@@ -73,7 +73,7 @@ public class AlterTableWithViewsIT extends 
BaseHBaseManagedTimeTableReuseIT {
     }
        
        @BeforeClass
-    @Shadower(classBeingShadowed = BaseHBaseManagedTimeTableReuseIT.class)
+    @Shadower(classBeingShadowed = ParallelStatsDisabledIT.class)
     public static void doSetup() throws Exception {
         Map<String,String> props = Maps.newHashMapWithExpectedSize(1);
         props.put(QueryServices.TRANSACTIONS_ENABLED, Boolean.toString(true));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
index 017a477..1aedc0d 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
@@ -60,7 +60,7 @@ import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-public class AppendOnlySchemaIT extends BaseHBaseManagedTimeTableReuseIT {
+public class AppendOnlySchemaIT extends ParallelStatsDisabledIT {
 
     
     private void testTableWithSameSchema(boolean notExists, boolean 
sameClient) throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
index 736de9f..c78ee9e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
@@ -40,7 +40,7 @@ import com.google.common.primitives.Doubles;
 import com.google.common.primitives.Floats;
 
 
-public class ArithmeticQueryIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ArithmeticQueryIT extends ParallelStatsDisabledIT {
 
     @Test
     public void testDecimalUpsertValue() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
index 17c6b72..de42af1 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayAppendFunctionIT.java
@@ -26,7 +26,7 @@ import java.sql.*;
 import org.apache.phoenix.schema.TypeMismatchException;
 import org.junit.Test;
 
-public class ArrayAppendFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ArrayAppendFunctionIT extends ParallelStatsDisabledIT {
     private String initTables(Connection conn) throws Exception {
         String tableName = generateRandomString();
         String ddl = "CREATE TABLE " + tableName + " (region_name VARCHAR 
PRIMARY KEY,varchars VARCHAR[],integers INTEGER[],doubles DOUBLE[],bigints 
BIGINT[],chars CHAR(15)[],double1 DOUBLE,char1 CHAR(17),nullcheck 
INTEGER,chars2 CHAR(15)[])";

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayConcatFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayConcatFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayConcatFunctionIT.java
index 168000e..d2c76bd 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayConcatFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayConcatFunctionIT.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class ArrayConcatFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ArrayConcatFunctionIT extends ParallelStatsDisabledIT {
 
     private String initTables(Connection conn) throws Exception {
         String tableName = generateRandomString();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java
index dd9a64a..9eece23 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java
@@ -28,7 +28,7 @@ import java.sql.*;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class ArrayFillFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ArrayFillFunctionIT extends ParallelStatsDisabledIT {
 
     private static final String REGIONS = generateRandomString();
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayPrependFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayPrependFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayPrependFunctionIT.java
index f3386d9..1fc04e7 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayPrependFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayPrependFunctionIT.java
@@ -27,7 +27,7 @@ import org.apache.phoenix.schema.TypeMismatchException;
 import org.apache.phoenix.schema.types.PhoenixArray;
 import org.junit.Test;
 
-public class ArrayPrependFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ArrayPrependFunctionIT extends ParallelStatsDisabledIT {
 
     private void initTableWithVarArray(Connection conn, String tableName, 
String type, Object[] objectArray, String value) throws SQLException {
         conn.createStatement().execute("CREATE TABLE " + tableName + " ( k 
VARCHAR PRIMARY KEY, a " + type + "[],b " + type + ")");

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayToStringFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayToStringFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayToStringFunctionIT.java
index 86ff7b6..39d6c77 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayToStringFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayToStringFunctionIT.java
@@ -29,7 +29,7 @@ import java.sql.ResultSet;
 import org.junit.Before;
 import org.junit.Test;
 
-public class ArrayToStringFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ArrayToStringFunctionIT extends ParallelStatsDisabledIT {
     private String tableName;
     private Connection conn;
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArraysWithNullsIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArraysWithNullsIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArraysWithNullsIT.java
index 5444e7f..4d487c5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArraysWithNullsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArraysWithNullsIT.java
@@ -26,7 +26,7 @@ import org.apache.phoenix.schema.types.PTimestamp;
 import org.apache.phoenix.schema.types.PhoenixArray;
 import org.junit.Test;
 
-public class ArraysWithNullsIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ArraysWithNullsIT extends ParallelStatsDisabledIT {
 
     @Test
     public void testArrayUpsertIntWithNulls() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java
index 3797884..8928248 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoCommitIT.java
@@ -32,7 +32,7 @@ import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 
 
-public class AutoCommitIT extends BaseHBaseManagedTimeTableReuseIT {
+public class AutoCommitIT extends ParallelStatsDisabledIT {
 
     @Test
     public void testMutationJoin() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoPartitionViewsIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoPartitionViewsIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoPartitionViewsIT.java
index f44c083..eb7bbdf 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoPartitionViewsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutoPartitionViewsIT.java
@@ -47,7 +47,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class AutoPartitionViewsIT extends BaseHBaseManagedTimeTableReuseIT {
+public class AutoPartitionViewsIT extends ParallelStatsDisabledIT {
 
     private String tableDDLOptions;
     private boolean isMultiTenant;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeTableReuseIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeTableReuseIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeTableReuseIT.java
deleted file mode 100644
index b09984b..0000000
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeTableReuseIT.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.phoenix.end2end;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.phoenix.query.BaseTest;
-import org.apache.phoenix.util.ReadOnlyProps;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-/**
- * Base class for tests that let HBase set timestamps.
- * We need to separate these from tests that rely on clients
- * to set timestamps, because we create/destroy the Phoenix tables
- * between tests and only allow a table time stamp to increase.
- * Without this separation table deletion/creation would fail.
- *
- * All tests extending this class use the mini cluster that is
- * shared by all classes extending this class
- *
- * Remember to use BaseTest.generateRandomString() to generate table
- * names for your tests otherwise there might be naming collisions between
- * other tests.
- * {@link BaseClientManagedTimeIT}.
- *
- * @since 0.1
- */
-@Category(HBaseManagedTimeTableReuseTest.class)
-public class BaseHBaseManagedTimeTableReuseIT extends BaseTest {
-    protected static Configuration getTestClusterConfig() {
-        // don't want callers to modify config.
-        return new Configuration(config);
-    }
-
-    @BeforeClass
-    public static void doSetup() throws Exception {
-        setUpTestDriver(ReadOnlyProps.EMPTY_PROPS);
-    }
-
-    @AfterClass
-    public static void doTeardown() throws Exception {
-        // no teardown since we are creating unique table names
-        // just destroy our test driver
-        destroyDriver();
-    }
-
-    @After
-    public void cleanUpAfterTest() throws Exception {
-        // no cleanup since we are using unique table names
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseParallelIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseParallelIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseParallelIT.java
new file mode 100644
index 0000000..14473f1
--- /dev/null
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseParallelIT.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.phoenix.end2end;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.phoenix.query.BaseTest;
+import org.apache.phoenix.util.ReadOnlyProps;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+/**
+ * Base class for tests that create unique tables for
+ * every test enabling them to be
+ * 1) run in parallel
+ * 2) not have to delete any tables
+ * 
+ * We need to separate these from tests that rely on clients
+ * to set timestamps, because we create/destroy the Phoenix tables
+ * between tests and only allow a table time stamp to increase.
+ * Without this separation table deletion/creation would fail.
+ *
+ * All tests extending this class use the mini cluster that is
+ * shared by all classes extending this class
+ *
+ * Remember to use BaseTest.generateRandomString() to generate table
+ * names for your tests otherwise there might be naming collisions between
+ * other tests.
+ */
+public abstract class BaseParallelIT extends BaseTest {
+    protected static Configuration getTestClusterConfig() {
+        // don't want callers to modify config.
+        return new Configuration(config);
+    }
+
+    @BeforeClass
+    public static void doSetup() throws Exception {
+        setUpTestDriver(ReadOnlyProps.EMPTY_PROPS);
+    }
+
+    @AfterClass
+    public static void doTeardown() throws Exception {
+        // no teardown since we are creating unique table names
+        // just destroy our test driver
+        destroyDriver();
+    }
+
+    @After
+    public void cleanUpAfterTest() throws Exception {
+        // no cleanup since we are using unique table names
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
index e0916a9..6b53cd5 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
@@ -35,7 +35,7 @@ import org.apache.phoenix.util.QueryUtil;
 
 import com.google.common.collect.Lists;
 
-public class BaseTenantSpecificViewIndexIT extends 
BaseHBaseManagedTimeTableReuseIT {
+public class BaseTenantSpecificViewIndexIT extends ParallelStatsDisabledIT {
     
     public static final String TENANT1_ID = "tenant1";
     public static final String TENANT2_ID = "tenant2";

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java
index 5f656e9..02c27cd 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryRowKeyIT.java
@@ -34,7 +34,7 @@ import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 
 
-public class BinaryRowKeyIT extends BaseHBaseManagedTimeTableReuseIT {
+public class BinaryRowKeyIT extends ParallelStatsDisabledIT {
 
     private static void initTableValues(String tableName) throws SQLException {
         Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
index 5b2f28c..686b47a 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CSVCommonsLoaderIT.java
@@ -45,7 +45,7 @@ import org.apache.phoenix.util.DateUtil;
 import org.apache.phoenix.util.PhoenixRuntime;
 import org.junit.Test;
 
-public class CSVCommonsLoaderIT extends BaseHBaseManagedTimeTableReuseIT {
+public class CSVCommonsLoaderIT extends ParallelStatsDisabledIT {
 
     private static final String DATATYPE_TABLE = "DATATYPE";
     private static final String DATATYPES_CSV_VALUES = "CKEY, CVARCHAR, CCHAR, 
CINTEGER, CDECIMAL, CUNSIGNED_INT, CBOOLEAN, CBIGINT, CUNSIGNED_LONG, CTIME, 
CDATE\n"

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/CbrtFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CbrtFunctionEnd2EndIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CbrtFunctionEnd2EndIT.java
index 25fc43f..6c5d209 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CbrtFunctionEnd2EndIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CbrtFunctionEnd2EndIT.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 /**
  * End to end tests for {@link CbrtFunction}
  */
-public class CbrtFunctionEnd2EndIT extends BaseHBaseManagedTimeTableReuseIT {
+public class CbrtFunctionEnd2EndIT extends ParallelStatsDisabledIT {
 
     private static final String KEY = "key";
     private static final double ZERO = 1e-8;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java
index 0c270f2..89a5fc9 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java
@@ -38,7 +38,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 
-public class CoalesceFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class CoalesceFunctionIT extends ParallelStatsDisabledIT {
 
     @Test
     public void testCoalesce() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java
index 1fc4b2c..be5470e 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConvertTimezoneFunctionIT.java
@@ -36,7 +36,7 @@ import org.junit.Test;
  *
  */
 
-public class ConvertTimezoneFunctionIT extends 
BaseHBaseManagedTimeTableReuseIT {
+public class ConvertTimezoneFunctionIT extends ParallelStatsDisabledIT {
 
     @Test
     public void testConvertTimezoneEurope() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
index fe02c57..97fbaf4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
@@ -50,7 +50,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 
-public class DateTimeIT extends BaseHBaseManagedTimeTableReuseIT {
+public class DateTimeIT extends ParallelStatsDisabledIT {
 
     protected Connection conn;
     protected Date date;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java
index 041649b..424aa7b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DecodeFunctionIT.java
@@ -35,7 +35,7 @@ import org.apache.phoenix.schema.types.PUnsignedLong;
 import org.junit.Test;
 
 
-public class DecodeFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class DecodeFunctionIT extends ParallelStatsDisabledIT {
 
        @Test
        public void shouldPass() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java
index 5234d10..a289634 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java
@@ -37,7 +37,7 @@ import org.apache.phoenix.util.QueryUtil;
 import org.junit.Test;
 
 
-public class DeleteIT extends BaseHBaseManagedTimeTableReuseIT {
+public class DeleteIT extends ParallelStatsDisabledIT {
     private static final int NUMBER_OF_ROWS = 20;
     private static final int NTH_ROW_NULL = 5;
     

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/DisableLocalIndexIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DisableLocalIndexIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DisableLocalIndexIT.java
index 38dfa8c..b34c61d 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DisableLocalIndexIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DisableLocalIndexIT.java
@@ -43,9 +43,9 @@ import org.junit.Test;
 
 import com.google.common.collect.Maps;
 
-public class DisableLocalIndexIT extends BaseHBaseManagedTimeTableReuseIT {
+public class DisableLocalIndexIT extends ParallelStatsDisabledIT {
     @BeforeClass
-    @Shadower(classBeingShadowed = BaseHBaseManagedTimeTableReuseIT.class)
+    @Shadower(classBeingShadowed = ParallelStatsDisabledIT.class)
     public static void doSetup() throws Exception {
         Map<String,String> props = Maps.newHashMapWithExpectedSize(1);
         // Must update config before starting server

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
index e8e9e07..df10c84 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
@@ -35,7 +35,7 @@ import org.apache.phoenix.util.QueryUtil;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class DistinctPrefixFilterIT extends BaseHBaseManagedTimeTableReuseIT {
+public class DistinctPrefixFilterIT extends ParallelStatsDisabledIT {
     private static final String testTableF = generateRandomString();
     private static final String testTableV = generateRandomString();
     private static final String testSeq = testTableF + "_seq";
@@ -44,7 +44,7 @@ public class DistinctPrefixFilterIT extends 
BaseHBaseManagedTimeTableReuseIT {
 
     @BeforeClass
     public static void doSetup() throws Exception {
-        BaseHBaseManagedTimeTableReuseIT.doSetup();
+        ParallelStatsDisabledIT.doSetup();
 
         Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         conn = DriverManager.getConnection(getUrl(), props);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java
index e30c474..3fc05a7 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicColumnIT.java
@@ -59,7 +59,7 @@ import org.junit.Test;
  */
 
 
-public class DynamicColumnIT extends BaseHBaseManagedTimeTableReuseIT {
+public class DynamicColumnIT extends ParallelStatsDisabledIT {
     private static final byte[] FAMILY_NAME_A = 
Bytes.toBytes(SchemaUtil.normalizeIdentifier("A"));
     private static final byte[] FAMILY_NAME_B = 
Bytes.toBytes(SchemaUtil.normalizeIdentifier("B"));
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java
index f7d2b52..3be739b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicFamilyIT.java
@@ -61,7 +61,7 @@ import org.junit.Test;
 @edu.umd.cs.findbugs.annotations.SuppressWarnings(
         value="RV_RETURN_VALUE_IGNORED", 
         justification="Designed to ignore.")
-public class DynamicFamilyIT extends BaseHBaseManagedTimeTableReuseIT {
+public class DynamicFamilyIT extends ParallelStatsDisabledIT {
     private static final String WEB_STATS = generateRandomString();
     private static final String WEB_STATS_SCHEMA_NAME = "";
     private static final byte[] A_CF = 
Bytes.toBytes(SchemaUtil.normalizeIdentifier("A"));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java
index c0fd38a..4cd2c6b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DynamicUpsertIT.java
@@ -46,7 +46,7 @@ import org.junit.Test;
  */
 
 
-public class DynamicUpsertIT extends BaseHBaseManagedTimeTableReuseIT {
+public class DynamicUpsertIT extends ParallelStatsDisabledIT {
     private String tableName;
 
     @Before

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/EncodeFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EncodeFunctionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EncodeFunctionIT.java
index d32b900..b61ac73 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EncodeFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EncodeFunctionIT.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 
 import com.google.common.collect.Lists;
 
-public class EncodeFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class EncodeFunctionIT extends ParallelStatsDisabledIT {
 
     /**
      * Helper to test ENCODE function

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java
index 1b97d5a..c227dd5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/EvaluationOfORIT.java
@@ -33,8 +33,7 @@ import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 
 
-
-public class EvaluationOfORIT extends BaseHBaseManagedTimeTableReuseIT{
+public class EvaluationOfORIT extends ParallelStatsDisabledIT {
 
     @Test
     public void testFalseOrFalse() throws SQLException {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java
index 41d3ee7..f82fffe 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExecuteStatementsIT.java
@@ -48,7 +48,7 @@ import org.apache.phoenix.util.PhoenixRuntime;
 import org.junit.Test;
 
 
-public class ExecuteStatementsIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ExecuteStatementsIT extends ParallelStatsDisabledIT {
     
     @Test
     public void testExecuteStatements() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExpFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExpFunctionEnd2EndIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExpFunctionEnd2EndIT.java
index 88bf763..40b0637 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExpFunctionEnd2EndIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ExpFunctionEnd2EndIT.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 /**
  * End to end tests for {@link ExpFunction}
  */
-public class ExpFunctionEnd2EndIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ExpFunctionEnd2EndIT extends ParallelStatsDisabledIT {
 
     private static final String KEY = "key";
     private static final double ZERO = 1e-8;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java
index 7978291..e78c130 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/FirstValueFunctionIT.java
@@ -27,7 +27,7 @@ import java.sql.ResultSet;
 
 import org.junit.Test;
 
-public class FirstValueFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class FirstValueFunctionIT extends ParallelStatsDisabledIT {
 
     @Test
     public void signedLongAsBigInt() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetByteBitFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetByteBitFunctionEnd2EndIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetByteBitFunctionEnd2EndIT.java
index 734f2c4..e95ca4c 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetByteBitFunctionEnd2EndIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GetSetByteBitFunctionEnd2EndIT.java
@@ -39,7 +39,7 @@ import org.junit.Test;
  * End to end tests for {@link GetByteFunction} {@link SetByteFunction} {@link 
GetBitFunction}
  * {@link SetBitFunction}
  */
-public class GetSetByteBitFunctionEnd2EndIT extends 
BaseHBaseManagedTimeTableReuseIT {
+public class GetSetByteBitFunctionEnd2EndIT extends ParallelStatsDisabledIT {
 
     private static final String KEY = "key";
     private static final String TABLE_NAME = generateRandomString();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java
index 7cbbcbe..4830a75 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByCaseIT.java
@@ -39,7 +39,7 @@ import org.apache.phoenix.util.QueryUtil;
 import org.junit.Test;
 
 
-public class GroupByCaseIT extends BaseHBaseManagedTimeTableReuseIT {
+public class GroupByCaseIT extends ParallelStatsDisabledIT {
     private static void initData(Connection conn, String tableName) throws 
SQLException {
         conn.createStatement().execute("create table " + tableName +
                 "   (id varchar not null primary key,\n" +

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/HBaseManagedTimeTableReuseTest.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HBaseManagedTimeTableReuseTest.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HBaseManagedTimeTableReuseTest.java
deleted file mode 100644
index f0afae4..0000000
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HBaseManagedTimeTableReuseTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you maynot use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicablelaw or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.phoenix.end2end;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.apache.phoenix.query.BaseTest;
-
-/**
- * 
- * Annotation to denote that the test lets HBase manage timestamp 
- * itself. Tests in these category do not drop HBase tables at 
- * the end of every test class. To prevent table name collisions that could 
happen otherwise,
- * these tests use random table names generated by {@link 
BaseTest#generateRandomString}.
- * 
- * Tests using a mini cluster need to be classified either 
- * as {@link HBaseManagedTimeTableReuseTest} or {@link ClientManagedTimeTest}
- * or {@link NeedsOwnMiniClusterTest} or {@link HBaseManagedTimeTest} 
otherwise they won't be run
- * when one runs mvn verify or mvn install.
- * 
- * @since 4.1
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-@Inherited
-public @interface HBaseManagedTimeTableReuseTest {
-
-}

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/HBaseManagedTimeTest.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HBaseManagedTimeTest.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HBaseManagedTimeTest.java
index f57eb4c..c9eee86 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HBaseManagedTimeTest.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HBaseManagedTimeTest.java
@@ -30,7 +30,7 @@ import java.lang.annotation.Target;
  * 
  * Tests using a mini cluster need to be classified either 
  * as {@link HBaseManagedTimeTest} or {@link ClientManagedTimeTest} 
- * or {@link NeedsOwnMiniClusterTest} or {@link HBaseManagedTimeTableReuseTest}
+ * or {@link NeedsOwnMiniClusterTest} or {@link ParallelStatsDisabledTest}
  * otherwise they won't be run when one runs mvn verify or mvn install.
  * 
  * @since 4.1

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinMoreIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinMoreIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinMoreIT.java
index 715132f..c9530a8 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinMoreIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinMoreIT.java
@@ -40,7 +40,7 @@ import org.junit.Test;
 
 import com.google.common.collect.Maps;
 
-public class HashJoinMoreIT extends BaseHBaseManagedTimeTableReuseIT {
+public class HashJoinMoreIT extends ParallelStatsDisabledIT {
     private final String[] plans = new String[] {
             /*
              * testJoinWithKeyRangeOptimization()
@@ -92,7 +92,7 @@ public class HashJoinMoreIT extends 
BaseHBaseManagedTimeTableReuseIT {
     };
     
     @BeforeClass
-    @Shadower(classBeingShadowed = BaseHBaseManagedTimeTableReuseIT.class)
+    @Shadower(classBeingShadowed = ParallelStatsDisabledIT.class)
     public static void doSetup() throws Exception {
         Map<String,String> props = Maps.newHashMapWithExpectedSize(3);
         // Forces server cache to be used

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
index 0038c3a..b0c661e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
@@ -45,7 +45,7 @@ import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 
 
-public class InListIT extends BaseHBaseManagedTimeTableReuseIT {
+public class InListIT extends ParallelStatsDisabledIT {
 
     @Test
     public void testLeadingPKWithTrailingRVC() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java
index c6bfe9a..87a0b4b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InMemoryOrderByIT.java
@@ -32,7 +32,7 @@ public class InMemoryOrderByIT extends OrderByIT {
     }
 
     @BeforeClass
-    @Shadower(classBeingShadowed = BaseHBaseManagedTimeTableReuseIT.class)
+    @Shadower(classBeingShadowed = ParallelStatsDisabledIT.class)
     public static void doSetup() throws Exception {
         Map<String,String> props = Maps.newHashMapWithExpectedSize(1);
         props.put(QueryServices.SPOOL_THRESHOLD_BYTES_ATTRIB, 
Integer.toString(1024*1024));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
index 0adcc10..e77499a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
@@ -28,7 +28,7 @@ import java.sql.ResultSet;
 
 import org.junit.Test;
 
-public class InstrFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class InstrFunctionIT extends ParallelStatsDisabledIT {
     private void initTable(Connection conn, String tableName, String 
sortOrder, String s, String subStr) throws Exception {
         String ddl = "CREATE TABLE " + tableName + " (name VARCHAR NOT NULL 
PRIMARY KEY " + sortOrder + ", substr VARCHAR)";
         conn.createStatement().execute(ddl);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java
index 504b18c..fb12fc4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IsNullIT.java
@@ -30,7 +30,7 @@ import java.sql.ResultSet;
 import org.junit.Test;
 
 
-public class IsNullIT extends BaseHBaseManagedTimeTableReuseIT {
+public class IsNullIT extends ParallelStatsDisabledIT {
     @Test
     public void testIsNullInPk() throws Exception {
         String tableName = generateRandomString();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java
index f8d2d32..e28f510 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LastValueFunctionIT.java
@@ -28,7 +28,7 @@ import java.sql.ResultSet;
 import org.junit.Test;
 
 
-public class LastValueFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class LastValueFunctionIT extends ParallelStatsDisabledIT {
 
     @Test
     public void unsignedLong() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
index 2fcee45..2d6b2cb 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LikeExpressionIT.java
@@ -33,7 +33,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class LikeExpressionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class LikeExpressionIT extends ParallelStatsDisabledIT {
 
     private static final String TEST_TABLE = generateRandomString();
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/LnLogFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LnLogFunctionEnd2EndIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LnLogFunctionEnd2EndIT.java
index 466e71d..ad4efbc 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/LnLogFunctionEnd2EndIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LnLogFunctionEnd2EndIT.java
@@ -33,7 +33,7 @@ import org.junit.Test;
 /**
  * End to end tests for {@link LnFunction} and {@link LogFunction}
  */
-public class LnLogFunctionEnd2EndIT extends BaseHBaseManagedTimeTableReuseIT {
+public class LnLogFunctionEnd2EndIT extends ParallelStatsDisabledIT {
 
     private static final String KEY = "key";
     private static final double ZERO = 1e-9;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java
index 0b63aa8..b5fc2e9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MD5FunctionIT.java
@@ -30,7 +30,7 @@ import java.sql.ResultSet;
 import org.junit.Test;
 
 
-public class MD5FunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class MD5FunctionIT extends ParallelStatsDisabledIT {
   
   @Test
   public void testRetrieve() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/MapReduceIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MapReduceIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MapReduceIT.java
index 275d524..0b42a1f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MapReduceIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MapReduceIT.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.*;
 /**
  * Test that our MapReduce basic tools work as expected
  */
-public class MapReduceIT extends BaseHBaseManagedTimeTableReuseIT {
+public class MapReduceIT extends ParallelStatsDisabledIT {
 
     private static final String STOCK_NAME = "STOCK_NAME";
     private static final String RECORDING_YEAR = "RECORDING_YEAR";

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java
index 3ae33fb..4bbbd03 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MappingTableDataTypeIT.java
@@ -49,7 +49,7 @@ import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 
 
-public class MappingTableDataTypeIT extends BaseHBaseManagedTimeTableReuseIT {
+public class MappingTableDataTypeIT extends ParallelStatsDisabledIT {
     @Test
     public void testMappingHbaseTableToPhoenixTable() throws Exception {
         String mtest = generateRandomString();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/MinMaxAggregateFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MinMaxAggregateFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MinMaxAggregateFunctionIT.java
index 3a5088d..c2228ff 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MinMaxAggregateFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MinMaxAggregateFunctionIT.java
@@ -23,7 +23,7 @@ import java.util.Properties;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 
-public class MinMaxAggregateFunctionIT extends 
BaseHBaseManagedTimeTableReuseIT {
+public class MinMaxAggregateFunctionIT extends ParallelStatsDisabledIT {
 
     private static final String TABLE_NAME = generateRandomString();
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java
index 8cb061f..06ffb16 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ModulusExpressionIT.java
@@ -32,7 +32,7 @@ import java.sql.SQLException;
 import org.junit.Test;
 
 
-public class ModulusExpressionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ModulusExpressionIT extends ParallelStatsDisabledIT {
     
     private static final long SMALL_VALUE = 31L;
     private static final long LARGE_VALUE = 0x5dec6f3847021a9bL;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java
index 0f91978..fb96977 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NamespaceSchemaMappingIT.java
@@ -44,7 +44,7 @@ import org.junit.Test;
 /*
  * since 4.8
  */
-public class NamespaceSchemaMappingIT extends BaseHBaseManagedTimeTableReuseIT 
{
+public class NamespaceSchemaMappingIT extends ParallelStatsDisabledIT {
     /**
      * Tests that when: There is a table created with older version of phoenix 
and a table created with newer version
      * having {@code QueryServices#IS_NAMESPACE_MAPPING_ENABLED} true, then 
there is only a flag

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java
index 697c04c..4538cd0 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NthValueFunctionIT.java
@@ -29,7 +29,7 @@ import java.util.ArrayList;
 import org.junit.Test;
 
 
-public class NthValueFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class NthValueFunctionIT extends ParallelStatsDisabledIT {
 
     @Test
     public void simpleTest() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/OctetLengthFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OctetLengthFunctionEnd2EndIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OctetLengthFunctionEnd2EndIT.java
index 7977ab5..0554814 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OctetLengthFunctionEnd2EndIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OctetLengthFunctionEnd2EndIT.java
@@ -33,7 +33,7 @@ import org.junit.Test;
 /**
  * End to end tests for {@link OctetLengthFunction}
  */
-public class OctetLengthFunctionEnd2EndIT extends 
BaseHBaseManagedTimeTableReuseIT {
+public class OctetLengthFunctionEnd2EndIT extends ParallelStatsDisabledIT {
 
     private static final String KEY = "key";
     private static final String TABLE_NAME = generateRandomString();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
index dcb2a0d..0f6641c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByIT.java
@@ -43,7 +43,7 @@ import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 
 
-public class OrderByIT extends BaseHBaseManagedTimeTableReuseIT {
+public class OrderByIT extends ParallelStatsDisabledIT {
 
     @Test
     public void testMultiOrderByExpr() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/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
new file mode 100644
index 0000000..4575867
--- /dev/null
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledIT.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.phoenix.end2end;
+
+import org.junit.experimental.categories.Category;
+
+/**
+ * Base class for tests that do not have statistics enabled.
+ *
+ */
+@Category(ParallelStatsDisabledTest.class)
+public abstract class ParallelStatsDisabledIT extends BaseParallelIT {
+
+}

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledTest.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledTest.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledTest.java
new file mode 100644
index 0000000..bb8c19f
--- /dev/null
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you maynot use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicablelaw or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.phoenix.end2end;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apache.phoenix.query.BaseTest;
+
+/**
+ * 
+ * Annotation to denote that the test lets HBase manage timestamp 
+ * itself. Tests in these category do not drop HBase tables at 
+ * the end of every test class. To prevent table name collisions that could 
happen otherwise,
+ * these tests use random table names generated by {@link 
BaseTest#generateRandomString}.
+ * 
+ * Tests using a mini cluster need to be classified either 
+ * as {@link ParallelStatsDisabledTest} or {@link ClientManagedTimeTest}
+ * or {@link NeedsOwnMiniClusterTest} or {@link HBaseManagedTimeTest} 
otherwise they won't be run
+ * when one runs mvn verify or mvn install.
+ * 
+ * @since 4.1
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface ParallelStatsDisabledTest {
+
+}

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java
new file mode 100644
index 0000000..8ecb7b4
--- /dev/null
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.phoenix.end2end;
+
+import org.junit.experimental.categories.Category;
+
+/**
+ * 
+ * Base class for tests that have statistics enabled.
+ *
+ */
+@Category(ParallelStatsEnabledTest.class)
+public abstract class ParallelStatsEnabledIT extends BaseParallelIT {
+
+}

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledTest.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledTest.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledTest.java
new file mode 100644
index 0000000..6607b05
--- /dev/null
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you maynot use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicablelaw or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.phoenix.end2end;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apache.phoenix.query.BaseTest;
+
+/**
+ * 
+ * Annotation to denote that the test lets HBase manage timestamp 
+ * itself. Tests in these category do not drop HBase tables at 
+ * the end of every test class. To prevent table name collisions that could 
happen otherwise,
+ * these tests use random table names generated by {@link 
BaseTest#generateRandomString}.
+ * 
+ * Tests using a mini cluster need to be classified either 
+ * as {@link ParallelStatsEnabledTest} or {@link ClientManagedTimeTest}
+ * or {@link NeedsOwnMiniClusterTest} or {@link HBaseManagedTimeTest} 
otherwise they won't be run
+ * when one runs mvn verify or mvn install.
+ * 
+ * @since 4.1
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface ParallelStatsEnabledTest {
+
+}

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java
index 598785c..31423db 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PercentileIT.java
@@ -55,7 +55,7 @@ import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 
 
-public class PercentileIT extends BaseHBaseManagedTimeTableReuseIT {
+public class PercentileIT extends ParallelStatsDisabledIT {
 
     @Test
     public void testPercentile() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRuntimeIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRuntimeIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRuntimeIT.java
index c84a76c..1d48944 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRuntimeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRuntimeIT.java
@@ -54,7 +54,7 @@ import org.junit.Test;
 
 import com.google.common.collect.Sets;
 
-public class PhoenixRuntimeIT extends BaseHBaseManagedTimeTableReuseIT {
+public class PhoenixRuntimeIT extends ParallelStatsDisabledIT {
     private static void assertTenantIds(Expression e, HTableInterface htable, 
Filter filter, String[] tenantIds) throws IOException {
         ImmutableBytesWritable ptr = new ImmutableBytesWritable();
         Scan scan = new Scan();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/PowerFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PowerFunctionEnd2EndIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PowerFunctionEnd2EndIT.java
index cb120bd..3535ec0 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PowerFunctionEnd2EndIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PowerFunctionEnd2EndIT.java
@@ -33,7 +33,7 @@ import org.junit.Test;
 /**
  * End to end tests for {@link PowerFunction}
  */
-public class PowerFunctionEnd2EndIT extends BaseHBaseManagedTimeTableReuseIT {
+public class PowerFunctionEnd2EndIT extends ParallelStatsDisabledIT {
 
     private static final String KEY = "key";
     private static final double ZERO = 1e-9;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/PrimitiveTypeIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PrimitiveTypeIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PrimitiveTypeIT.java
index 5891a62..2b66118 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PrimitiveTypeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PrimitiveTypeIT.java
@@ -32,7 +32,7 @@ import org.apache.phoenix.util.TestUtil;
 import org.junit.Test;
 
 
-public class PrimitiveTypeIT extends BaseHBaseManagedTimeTableReuseIT {
+public class PrimitiveTypeIT extends ParallelStatsDisabledIT {
 
     private static final Properties PROPS = 
PropertiesUtil.deepCopy(TestUtil.TEST_PROPERTIES);
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java
index 6819e57..51d08d8 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryExecWithoutSCNIT.java
@@ -32,7 +32,7 @@ import java.util.Properties;
 import org.junit.Test;
 
 
-public class QueryExecWithoutSCNIT extends BaseHBaseManagedTimeTableReuseIT {
+public class QueryExecWithoutSCNIT extends ParallelStatsDisabledIT {
     @Test
     public void testScanNoSCN() throws Exception {
         long ts = System.currentTimeMillis();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
index 6da9144..d87b954 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
@@ -44,7 +44,7 @@ import org.junit.Test;
 import com.google.common.collect.Lists;
 
 
-public class QueryMoreIT extends BaseHBaseManagedTimeTableReuseIT {
+public class QueryMoreIT extends ParallelStatsDisabledIT {
     
     private String dataTableName;
     //queryAgainstTenantSpecificView = true, dataTableSalted = true 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/RTrimFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RTrimFunctionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RTrimFunctionIT.java
index f691dd0..b425476 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RTrimFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RTrimFunctionIT.java
@@ -33,7 +33,7 @@ import org.apache.phoenix.util.QueryUtil;
 import org.junit.Test;
 
 
-public class RTrimFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class RTrimFunctionIT extends ParallelStatsDisabledIT {
     
     @Test
     public void testWithFixedLengthAscPK() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java
index 0b86af0..ed3c4f9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReadOnlyIT.java
@@ -32,7 +32,7 @@ import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 
 
-public class ReadOnlyIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ReadOnlyIT extends ParallelStatsDisabledIT {
 
     @Test
     public void testConnectionReadOnly() throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpReplaceFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpReplaceFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpReplaceFunctionIT.java
index 5ce04eb..037d48d 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpReplaceFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpReplaceFunctionIT.java
@@ -33,7 +33,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 
-public class RegexpReplaceFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class RegexpReplaceFunctionIT extends ParallelStatsDisabledIT {
 
     private int id;
     protected  String tableName;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java
index 806d589..f9a0873 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSplitFunctionIT.java
@@ -34,7 +34,7 @@ import java.sql.Types;
 import org.junit.Test;
 
 
-public class RegexpSplitFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class RegexpSplitFunctionIT extends ParallelStatsDisabledIT {
 
     private String tableName;
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java
index 777ccd1..889451e 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RegexpSubstrFunctionIT.java
@@ -33,7 +33,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 
-public class RegexpSubstrFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class RegexpSubstrFunctionIT extends ParallelStatsDisabledIT {
 
     private int id;
     String tableName;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java
index 3a1f8c2..d2c89dc 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseFunctionIT.java
@@ -30,7 +30,7 @@ import java.sql.ResultSet;
 import org.junit.Test;
 
 
-public class ReverseFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ReverseFunctionIT extends ParallelStatsDisabledIT {
 
     private String initTable(Connection conn, String sortOrder, String s) 
throws Exception {
         String reverseTest =  generateRandomString();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java
index ff29840..16ccc53 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ReverseScanIT.java
@@ -52,7 +52,7 @@ import org.junit.Test;
 import com.google.common.collect.Maps;
 
 
-public class ReverseScanIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ReverseScanIT extends ParallelStatsDisabledIT {
 
     private static byte[][] getSplitsAtRowKeys(String tenantId) {
         return new byte[][] { 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFuncIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFuncIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFuncIT.java
index a5251a9..c94cf50 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFuncIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RoundFloorCeilFuncIT.java
@@ -51,7 +51,7 @@ import com.google.common.primitives.Floats;
  * End to end tests for {@link RoundFunction}, {@link FloorFunction}, {@link 
CeilFunction} 
  *
  */
-public class RoundFloorCeilFuncIT extends BaseHBaseManagedTimeTableReuseIT {
+public class RoundFloorCeilFuncIT extends ParallelStatsDisabledIT {
     private static final long millisPart = 660;
     private static final int nanosPart = 500100;
     private static final BigDecimal decimalUpserted = 
BigDecimal.valueOf(1.264);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/424934ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/SerialIteratorsIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SerialIteratorsIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SerialIteratorsIT.java
index d4c71af..0494342 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SerialIteratorsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SerialIteratorsIT.java
@@ -37,7 +37,7 @@ import org.junit.Test;
 
 import com.google.common.collect.Maps;
 
-public class SerialIteratorsIT extends BaseHBaseManagedTimeTableReuseIT {
+public class SerialIteratorsIT extends ParallelStatsDisabledIT {
     private String tableName = generateRandomString();
     private final String[] strings = { "a", "b", "c", "d", "e", "f", "g", "h", 
"i", "j", "k", "l", "m", "n", "o", "p",
             "q", "r", "s", "t", "u", "v", "w", "x", "y", "z" };

Reply via email to