You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2016/09/19 14:47:17 UTC
[1/3] phoenix git commit: PHOENIX-3293 Create separate test
categories for stats enabled and disabled
Repository: phoenix
Updated Branches:
refs/heads/master 14d16c853 -> e8ffc9c53
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/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" };
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java
index e4f3c1d..bf2e933 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerExceptionIT.java
@@ -32,7 +32,7 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-public class ServerExceptionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ServerExceptionIT extends ParallelStatsDisabledIT {
@Test
public void testServerExceptionBackToClient() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/SignFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SignFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SignFunctionEnd2EndIT.java
index 5c86955..3cc8041 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SignFunctionEnd2EndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SignFunctionEnd2EndIT.java
@@ -36,7 +36,7 @@ import org.junit.Test;
* End to end tests for {@link SignFunction}
* @since 4.0.0
*/
-public class SignFunctionEnd2EndIT extends BaseHBaseManagedTimeTableReuseIT {
+public class SignFunctionEnd2EndIT extends ParallelStatsDisabledIT {
private static final String KEY = "key";
private static final String TEST_SIGNED = generateRandomString();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
index 39ba19e..d4dd088 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java
@@ -43,7 +43,7 @@ import org.junit.Test;
import com.google.common.collect.Maps;
-public class SkipScanAfterManualSplitIT extends BaseHBaseManagedTimeTableReuseIT {
+public class SkipScanAfterManualSplitIT extends ParallelStatsDisabledIT {
private static final int BATCH_SIZE = 25;
private static final int MAX_FILESIZE = 1024 * 10;
@@ -60,7 +60,7 @@ public class SkipScanAfterManualSplitIT extends BaseHBaseManagedTimeTableReuseIT
private static final int MAX_CHAR = 'z';
@BeforeClass
- @Shadower(classBeingShadowed = BaseHBaseManagedTimeTableReuseIT.class)
+ @Shadower(classBeingShadowed = ParallelStatsDisabledIT.class)
public static void doSetup() throws Exception {
Map<String,String> props = Maps.newHashMapWithExpectedSize(2);
// needed for 64 region parallelization due to splitting
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java
index 944acf7..17df5ba 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SkipScanQueryIT.java
@@ -41,7 +41,7 @@ import org.apache.phoenix.util.PhoenixRuntime;
import org.junit.Test;
-public class SkipScanQueryIT extends BaseHBaseManagedTimeTableReuseIT {
+public class SkipScanQueryIT extends ParallelStatsDisabledIT {
private String initIntInTable(Connection conn, List<Integer> data) throws SQLException {
String tableName = generateRandomString();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java
index f1be09f..9570021 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java
@@ -39,10 +39,10 @@ import org.junit.Test;
import com.google.common.collect.Maps;
-public class SortMergeJoinMoreIT extends BaseHBaseManagedTimeTableReuseIT {
+public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT {
@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/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
index 87814fc..dc22ff8 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
@@ -55,7 +55,7 @@ import com.google.common.collect.Lists;
*/
-public class SortOrderIT extends BaseHBaseManagedTimeTableReuseIT {
+public class SortOrderIT extends ParallelStatsDisabledIT {
private String baseTableName;
@Before
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
index 728aa6f..02a5d71 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
@@ -38,7 +38,7 @@ import com.google.common.io.Files;
-public class SpooledTmpFileDeleteIT extends BaseHBaseManagedTimeTableReuseIT {
+public class SpooledTmpFileDeleteIT extends ParallelStatsDisabledIT {
private Connection conn = null;
private Properties props = null;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/SqrtFunctionEnd2EndIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SqrtFunctionEnd2EndIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SqrtFunctionEnd2EndIT.java
index 877b46d..1426564 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SqrtFunctionEnd2EndIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SqrtFunctionEnd2EndIT.java
@@ -34,7 +34,7 @@ import org.junit.Test;
/**
* End to end tests for {@link SqrtFunction}
*/
-public class SqrtFunctionEnd2EndIT extends BaseHBaseManagedTimeTableReuseIT {
+public class SqrtFunctionEnd2EndIT 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/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java
index 887a30e..a0960e5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatementHintsIT.java
@@ -37,7 +37,7 @@ import org.junit.Test;
*/
-public class StatementHintsIT extends BaseHBaseManagedTimeTableReuseIT {
+public class StatementHintsIT extends ParallelStatsDisabledIT {
private static final String TABLE_NAME = generateRandomString();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java
index 280b0aa..79c2be2 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StddevIT.java
@@ -30,7 +30,7 @@ import java.sql.ResultSet;
import org.junit.Test;
-public class StddevIT extends BaseHBaseManagedTimeTableReuseIT {
+public class StddevIT extends ParallelStatsDisabledIT {
@Test
public void testSTDDEV_POP() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsIT.java
index 363198c..904743a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsIT.java
@@ -58,7 +58,7 @@ import com.google.common.collect.Lists;
* functionality allows having row-level versioning (similar to how KEEP_DELETED_CELLS works), but
* also allows permanently deleting a row.
*/
-public class StoreNullsIT extends BaseHBaseManagedTimeTableReuseIT {
+public class StoreNullsIT extends ParallelStatsDisabledIT {
private static final Log LOG = LogFactory.getLog(StoreNullsIT.class);
private String WITH_NULLS;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringIT.java
index d5aad53..bcf31ca 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringIT.java
@@ -40,7 +40,7 @@ import com.google.common.collect.Lists;
* Tests for the LPAD built-in function.
*/
-public class StringIT extends BaseHBaseManagedTimeTableReuseIT {
+public class StringIT extends ParallelStatsDisabledIT {
/**
* Helper to test LPAD function
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringToArrayFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringToArrayFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringToArrayFunctionIT.java
index d341646..d0f45c7 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringToArrayFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StringToArrayFunctionIT.java
@@ -28,7 +28,7 @@ import org.apache.phoenix.schema.types.PhoenixArray;
import org.junit.BeforeClass;
import org.junit.Test;
-public class StringToArrayFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class StringToArrayFunctionIT extends ParallelStatsDisabledIT {
private static final String TABLE_NAME = generateRandomString();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantIdTypeIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantIdTypeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantIdTypeIT.java
index a3ca355..22b3655 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantIdTypeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantIdTypeIT.java
@@ -42,7 +42,7 @@ import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Lists;
@RunWith(Parameterized.class)
-public class TenantIdTypeIT extends BaseHBaseManagedTimeTableReuseIT {
+public class TenantIdTypeIT extends ParallelStatsDisabledIT {
private Connection regularConnection(String url) throws SQLException {
Properties props = new Properties();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java
index e899eb2..48eb87e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TimezoneOffsetFunctionIT.java
@@ -34,7 +34,7 @@ import org.apache.phoenix.exception.SQLExceptionCode;
import org.junit.Test;
-public class TimezoneOffsetFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class TimezoneOffsetFunctionIT extends ParallelStatsDisabledIT {
@Test
public void testTimezoneOffset() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java
index 27d593a..7181918 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToCharFunctionIT.java
@@ -47,7 +47,7 @@ import org.junit.Test;
* @since 0.1
*/
-public class ToCharFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ToCharFunctionIT extends ParallelStatsDisabledIT {
private String TO_CHAR_TABLE_NAME;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToDateFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToDateFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToDateFunctionIT.java
index b530d2a..3b11419 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToDateFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ToDateFunctionIT.java
@@ -30,7 +30,7 @@ import java.util.Properties;
import static org.junit.Assert.*;
-public class ToDateFunctionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ToDateFunctionIT extends ParallelStatsDisabledIT {
private static final long ONE_HOUR_IN_MILLIS = 1000L * 60L * 60L;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java
index c6a7bf0..8f9a294 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java
@@ -37,7 +37,7 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
-public class UnionAllIT extends BaseHBaseManagedTimeTableReuseIT {
+public class UnionAllIT extends ParallelStatsDisabledIT {
@Test
public void testUnionAllSelects() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java
index 564fdd9..132c0ae 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertBigValuesIT.java
@@ -30,7 +30,7 @@ import java.util.Properties;
import org.junit.Test;
-public class UpsertBigValuesIT extends BaseHBaseManagedTimeTableReuseIT {
+public class UpsertBigValuesIT extends ParallelStatsDisabledIT {
private static final long INTEGER_MIN_MINUS_ONE = (long)Integer.MIN_VALUE - 1;
private static final long INTEGER_MAX_PLUS_ONE = (long)Integer.MAX_VALUE + 1;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
index a0b3939..3fbe5d7 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectAutoCommitIT.java
@@ -37,7 +37,7 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-public class UpsertSelectAutoCommitIT extends BaseHBaseManagedTimeTableReuseIT {
+public class UpsertSelectAutoCommitIT extends ParallelStatsDisabledIT {
public UpsertSelectAutoCommitIT() {
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java
index c42c287..ec84282 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UseSchemaIT.java
@@ -41,7 +41,7 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
-public class UseSchemaIT extends BaseHBaseManagedTimeTableReuseIT {
+public class UseSchemaIT extends ParallelStatsDisabledIT {
@Test
public void testUseSchemaCaseInsensitive() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncIndexDisabledIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncIndexDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncIndexDisabledIT.java
index 1e4cbcc..a6228e7 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncIndexDisabledIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncIndexDisabledIT.java
@@ -27,7 +27,7 @@ import java.sql.ResultSet;
import java.sql.Statement;
import java.util.Map;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.schema.PTable;
@@ -38,7 +38,7 @@ import org.junit.Test;
import com.google.common.collect.Maps;
-public class AsyncIndexDisabledIT extends BaseHBaseManagedTimeTableReuseIT {
+public class AsyncIndexDisabledIT extends ParallelStatsDisabledIT {
@BeforeClass
public static void doSetup() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java
index 60a428c..a0efd52 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java
@@ -12,11 +12,11 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Properties;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
-public class ChildViewsUseParentViewIndexIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ChildViewsUseParentViewIndexIT extends ParallelStatsDisabledIT {
@Test
public void testIndexOnParentViewWithTenantSpecificConnection() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java
index 93f8e27..9ee00d2 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/DropMetadataIT.java
@@ -39,7 +39,7 @@ import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryConstants;
@@ -59,12 +59,12 @@ import org.junit.Test;
import com.google.common.collect.Maps;
-public class DropMetadataIT extends BaseHBaseManagedTimeTableReuseIT {
+public class DropMetadataIT extends ParallelStatsDisabledIT {
private static final byte[] FAMILY_NAME = Bytes.toBytes(SchemaUtil.normalizeIdentifier("1"));
public static final String SCHEMA_NAME = "";
private final String TENANT_SPECIFIC_URL = getUrl() + ';' + TENANT_ID_ATTRIB + "=tenant1";
- @Shadower(classBeingShadowed = BaseHBaseManagedTimeTableReuseIT.class)
+ @Shadower(classBeingShadowed = ParallelStatsDisabledIT.class)
@BeforeClass
public static void doSetup() throws Exception {
Map<String,String> props = Maps.newHashMapWithExpectedSize(1);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
index 0ab171a..b84cf5d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
@@ -28,7 +28,7 @@ import java.sql.SQLException;
import java.util.Map;
import java.util.regex.Pattern;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.*;
@@ -37,10 +37,10 @@ import org.junit.Test;
import com.google.common.collect.Maps;
-public class GlobalIndexOptimizationIT extends BaseHBaseManagedTimeTableReuseIT {
+public class GlobalIndexOptimizationIT extends ParallelStatsDisabledIT {
@BeforeClass
- @Shadower(classBeingShadowed = BaseHBaseManagedTimeTableReuseIT.class)
+ @Shadower(classBeingShadowed = ParallelStatsDisabledIT.class)
public static void doSetup() throws Exception {
Map<String,String> props = Maps.newHashMapWithExpectedSize(3);
// Drop the HBase table metadata for this test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
index ec5267d..3e413e2 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
@@ -48,7 +48,7 @@ import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver;
import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.query.BaseTest;
@@ -69,7 +69,7 @@ import com.google.common.collect.Maps;
@RunWith(Parameterized.class)
-public class ImmutableIndexIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ImmutableIndexIT extends ParallelStatsDisabledIT {
private final boolean localIndex;
private final String tableDDLOptions;
@@ -91,7 +91,7 @@ public class ImmutableIndexIT extends BaseHBaseManagedTimeTableReuseIT {
}
@BeforeClass
- @Shadower(classBeingShadowed = BaseHBaseManagedTimeTableReuseIT.class)
+ @Shadower(classBeingShadowed = ParallelStatsDisabledIT.class)
public static void doSetup() throws Exception {
Map<String, String> serverProps = Maps.newHashMapWithExpectedSize(1);
serverProps.put("hbase.coprocessor.region.classes", CreateIndexRegionObserver.class.getName());
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexExpressionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexExpressionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexExpressionIT.java
index 0dc2036..3235c52 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexExpressionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexExpressionIT.java
@@ -28,7 +28,7 @@ import java.sql.SQLException;
import java.util.Properties;
import org.apache.commons.lang.StringUtils;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.execute.CommitException;
import org.apache.phoenix.query.QueryConstants;
@@ -38,7 +38,7 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.junit.Test;
-public class IndexExpressionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class IndexExpressionIT extends ParallelStatsDisabledIT {
@Test
public void testImmutableIndexCreateAndUpdate() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
index f06ac82..2e07aef 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
@@ -54,7 +54,7 @@ import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory;
import org.apache.phoenix.compile.ColumnResolver;
import org.apache.phoenix.compile.FromCompiler;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
@@ -82,7 +82,7 @@ import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Maps;
@RunWith(Parameterized.class)
-public class IndexIT extends BaseHBaseManagedTimeTableReuseIT {
+public class IndexIT extends ParallelStatsDisabledIT {
private final boolean localIndex;
private final boolean transactional;
@@ -106,7 +106,7 @@ public class IndexIT 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/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
index 2e1fe1d..3372b6a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
@@ -35,7 +35,7 @@ import java.sql.Types;
import java.util.Properties;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
@@ -53,7 +53,7 @@ import org.apache.phoenix.util.StringUtil;
import org.junit.Test;
-public class IndexMetadataIT extends BaseHBaseManagedTimeTableReuseIT {
+public class IndexMetadataIT extends ParallelStatsDisabledIT {
private enum Order {ASC, DESC};
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
index d3d775b..9a279bb 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
@@ -47,7 +47,7 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.phoenix.compile.QueryPlan;
import org.apache.phoenix.coprocessor.BaseScannerRegionObserver;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.hbase.index.IndexRegionSplitPolicy;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixStatement;
@@ -70,7 +70,7 @@ import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@RunWith(Parameterized.class)
-public class LocalIndexIT extends BaseHBaseManagedTimeTableReuseIT {
+public class LocalIndexIT extends ParallelStatsDisabledIT {
private boolean isNamespaceMapped;
private String schemaName;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
index 6dc4657..e5dfb0d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
@@ -44,7 +44,7 @@ import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Threads;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryServices;
@@ -66,7 +66,7 @@ import com.google.common.collect.Maps;
import com.google.common.primitives.Doubles;
@RunWith(Parameterized.class)
-public class MutableIndexIT extends BaseHBaseManagedTimeTableReuseIT {
+public class MutableIndexIT extends ParallelStatsDisabledIT {
protected final boolean localIndex;
private final String tableDDLOptions;
@@ -81,7 +81,7 @@ public class MutableIndexIT 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/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
index e47c055..ebdd565 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
@@ -29,7 +29,7 @@ import java.sql.ResultSet;
import java.util.Map;
import java.util.Properties;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryServices;
@@ -41,12 +41,12 @@ import org.junit.Test;
import com.google.common.collect.Maps;
-public class SaltedIndexIT extends BaseHBaseManagedTimeTableReuseIT {
+public class SaltedIndexIT extends ParallelStatsDisabledIT {
private static final int TABLE_SPLITS = 3;
private static final int INDEX_SPLITS = 4;
@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/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
index a886bca..7bd1478 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
@@ -34,7 +34,7 @@ import java.util.Collection;
import java.util.Properties;
import org.apache.phoenix.compile.QueryPlan;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.jdbc.PhoenixStatement;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.schema.PNameFactory;
@@ -45,7 +45,7 @@ import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@RunWith(Parameterized.class)
-public class ViewIndexIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ViewIndexIT extends ParallelStatsDisabledIT {
private boolean isNamespaceMapped;
@Parameters(name = "ViewIndexIT_isNamespaceMapped={0}") // name is used by failsafe as file name in reports
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java
index 8562c0a..44ec7a5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java
@@ -35,7 +35,7 @@ import java.util.Properties;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.HBaseAdmin;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryServices;
@@ -52,7 +52,7 @@ import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Maps;
@RunWith(Parameterized.class)
-public class MutableRollbackIT extends BaseHBaseManagedTimeTableReuseIT {
+public class MutableRollbackIT extends ParallelStatsDisabledIT {
private final boolean localIndex;
@@ -61,7 +61,7 @@ public class MutableRollbackIT extends BaseHBaseManagedTimeTableReuseIT {
}
@BeforeClass
- @Shadower(classBeingShadowed = BaseHBaseManagedTimeTableReuseIT.class)
+ @Shadower(classBeingShadowed = ParallelStatsDisabledIT.class)
public static void doSetup() throws Exception {
Map<String,String> props = Maps.newHashMapWithExpectedSize(2);
props.put(QueryServices.DEFAULT_TABLE_ISTRANSACTIONAL_ATTRIB, Boolean.toString(true));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/RollbackIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/RollbackIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/RollbackIT.java
index 92a69d0..fb50548 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/RollbackIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/RollbackIT.java
@@ -31,7 +31,7 @@ import java.util.Collection;
import java.util.Map;
import java.util.Properties;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PropertiesUtil;
@@ -47,7 +47,7 @@ import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Maps;
@RunWith(Parameterized.class)
-public class RollbackIT extends BaseHBaseManagedTimeTableReuseIT {
+public class RollbackIT extends ParallelStatsDisabledIT {
private final boolean localIndex;
private final boolean mutable;
@@ -58,7 +58,7 @@ public class RollbackIT extends BaseHBaseManagedTimeTableReuseIT {
}
@BeforeClass
- @Shadower(classBeingShadowed = BaseHBaseManagedTimeTableReuseIT.class)
+ @Shadower(classBeingShadowed = ParallelStatsDisabledIT.class)
public static void doSetup() throws Exception {
Map<String,String> props = Maps.newHashMapWithExpectedSize(2);
props.put(QueryServices.DEFAULT_TABLE_ISTRANSACTIONAL_ATTRIB, Boolean.toString(true));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
index a7ac817..d680954 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableUpsertSelectIT.java
@@ -31,12 +31,12 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Properties;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-public class SaltedTableUpsertSelectIT extends BaseHBaseManagedTimeTableReuseIT {
+public class SaltedTableUpsertSelectIT extends ParallelStatsDisabledIT {
@Test
public void testUpsertIntoSaltedTableFromNormalTable() throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
index e3688ca..c3f331b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableVarLengthRowKeyIT.java
@@ -29,12 +29,12 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Properties;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
-public class SaltedTableVarLengthRowKeyIT extends BaseHBaseManagedTimeTableReuseIT {
+public class SaltedTableVarLengthRowKeyIT extends ParallelStatsDisabledIT {
private static final String TEST_TABLE = generateRandomString();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java b/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java
index 7a93333..7b3b286 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/iterate/PhoenixQueryTimeoutIT.java
@@ -26,7 +26,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Properties;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.jdbc.PhoenixStatement;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -35,7 +35,7 @@ import org.junit.Test;
* Tests to validate that user specified property phoenix.query.timeoutMs
* works as expected.
*/
-public class PhoenixQueryTimeoutIT extends BaseHBaseManagedTimeTableReuseIT {
+public class PhoenixQueryTimeoutIT extends ParallelStatsDisabledIT {
private static final String QUERY_TIMEOUT_TEST = generateRandomString();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
index f065f28..ba35f4e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
@@ -42,7 +42,7 @@ import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.compile.StatementContext;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixResultSet;
@@ -58,12 +58,12 @@ import org.junit.Test;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-public class RoundRobinResultIteratorIT extends BaseHBaseManagedTimeTableReuseIT {
+public class RoundRobinResultIteratorIT extends ParallelStatsDisabledIT {
private static final int NUM_SALT_BUCKETS = 4;
@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.THREAD_POOL_SIZE_ATTRIB, Integer.toString(32));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java b/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
index f1eafc2..56f9f4b 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
@@ -36,7 +36,7 @@ import java.sql.SQLException;
import java.util.Map;
import java.util.Properties;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver;
import org.apache.phoenix.query.ConnectionQueryServices;
@@ -60,12 +60,12 @@ import com.google.common.collect.Maps;
* Verifies the number of rpcs calls from {@link MetaDataClient} updateCache()
* for transactional and non-transactional tables.
*/
-public class UpdateCacheIT extends BaseHBaseManagedTimeTableReuseIT {
+public class UpdateCacheIT extends ParallelStatsDisabledIT {
public static final int NUM_MILLIS_IN_DAY = 86400000;
@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/6b868392/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java b/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java
index 66f3e87..7e5d17f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/trace/BaseTracingTestIT.java
@@ -36,7 +36,7 @@ import org.apache.hadoop.metrics2.MetricsTag;
import org.apache.hadoop.metrics2.impl.ExposedMetricCounterLong;
import org.apache.hadoop.metrics2.impl.ExposedMetricsRecordImpl;
import org.apache.hadoop.metrics2.lib.ExposedMetricsInfoImpl;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.metrics.MetricInfo;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.schema.TableNotFoundException;
@@ -51,7 +51,7 @@ import org.junit.Before;
* connections, as well as any supporting utils.
*/
-public class BaseTracingTestIT extends BaseHBaseManagedTimeTableReuseIT {
+public class BaseTracingTestIT extends ParallelStatsDisabledIT {
@Before
public void resetTracingTableIfExists() throws Exception {
Connection conn = getConnectionWithoutTracing();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
index e1eac48..c219158 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
@@ -46,7 +46,7 @@ import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.coprocessor.PhoenixTransactionalProcessor;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
@@ -72,11 +72,11 @@ import org.junit.Test;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-public class TransactionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class TransactionIT extends ParallelStatsDisabledIT {
@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/6b868392/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java b/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
index 8f877ac..5a42a97 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
@@ -33,7 +33,7 @@ import java.util.Collection;
import java.util.Map;
import java.util.Properties;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.execute.MutationState;
import org.apache.phoenix.jdbc.PhoenixConnection;
@@ -51,7 +51,7 @@ import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Maps;
@RunWith(Parameterized.class)
-public class TxCheckpointIT extends BaseHBaseManagedTimeTableReuseIT {
+public class TxCheckpointIT extends ParallelStatsDisabledIT {
private final boolean localIndex;
private final boolean mutable;
@@ -63,7 +63,7 @@ public class TxCheckpointIT extends BaseHBaseManagedTimeTableReuseIT {
}
@BeforeClass
- @Shadower(classBeingShadowed = BaseHBaseManagedTimeTableReuseIT.class)
+ @Shadower(classBeingShadowed = ParallelStatsDisabledIT.class)
public static void doSetup() throws Exception {
Map<String,String> props = Maps.newHashMapWithExpectedSize(2);
props.put(QueryServices.DEFAULT_TABLE_ISTRANSACTIONAL_ATTRIB, Boolean.toString(true));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
----------------------------------------------------------------------
diff --git a/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java b/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
index 22dfa36..9b5988c 100644
--- a/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
+++ b/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
@@ -29,7 +29,7 @@ import org.apache.flume.lifecycle.LifecycleState;
import org.apache.flume.sink.DefaultSinkFactory;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.flume.serializer.EventSerializers;
import org.apache.phoenix.flume.serializer.CustomSerializer;
import org.apache.phoenix.flume.sink.NullPhoenixSink;
@@ -48,7 +48,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-public class PhoenixSinkIT extends BaseHBaseManagedTimeTableReuseIT {
+public class PhoenixSinkIT extends ParallelStatsDisabledIT {
private Context sinkContext;
private PhoenixSink sink;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
----------------------------------------------------------------------
diff --git a/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java b/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
index 6863401..eb3f9e8 100644
--- a/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
+++ b/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
@@ -40,7 +40,7 @@ import org.apache.flume.conf.Configurables;
import org.apache.flume.event.EventBuilder;
import org.apache.flume.lifecycle.LifecycleState;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.flume.serializer.EventSerializers;
import org.apache.phoenix.flume.sink.PhoenixSink;
import org.apache.phoenix.util.PropertiesUtil;
@@ -51,7 +51,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-public class RegexEventSerializerIT extends BaseHBaseManagedTimeTableReuseIT {
+public class RegexEventSerializerIT extends ParallelStatsDisabledIT {
private Context sinkContext;
private PhoenixSink sink;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/ResultBaseTestIT.java
----------------------------------------------------------------------
diff --git a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/ResultBaseTestIT.java b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/ResultBaseTestIT.java
index 07618a7..c300701 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/ResultBaseTestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/ResultBaseTestIT.java
@@ -18,7 +18,7 @@
package org.apache.phoenix.pherf;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.pherf.configuration.XMLConfigParser;
import org.apache.phoenix.pherf.result.ResultUtil;
import org.apache.phoenix.pherf.schema.SchemaReader;
@@ -30,7 +30,7 @@ import java.nio.file.Path;
import java.util.List;
import java.util.Properties;
-public class ResultBaseTestIT extends BaseHBaseManagedTimeTableReuseIT {
+public class ResultBaseTestIT extends ParallelStatsDisabledIT {
protected static final String matcherScenario = ".*scenario/.*test.*xml";
protected static final String matcherSchema = ".*datamodel/.*test.*sql";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/SchemaReaderIT.java
----------------------------------------------------------------------
diff --git a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/SchemaReaderIT.java b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/SchemaReaderIT.java
index 4f6d3c1..c2bfdc1 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/SchemaReaderIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/SchemaReaderIT.java
@@ -30,7 +30,7 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.pherf.configuration.Column;
import org.apache.phoenix.pherf.configuration.DataModel;
import org.apache.phoenix.pherf.configuration.Scenario;
@@ -40,7 +40,7 @@ import org.apache.phoenix.pherf.util.PhoenixUtil;
import org.junit.Test;
-public class SchemaReaderIT extends BaseHBaseManagedTimeTableReuseIT {
+public class SchemaReaderIT extends ParallelStatsDisabledIT {
protected static PhoenixUtil util = PhoenixUtil.create(true);
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-pig/src/it/java/org/apache/phoenix/pig/BasePigIT.java
----------------------------------------------------------------------
diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/BasePigIT.java b/phoenix-pig/src/it/java/org/apache/phoenix/pig/BasePigIT.java
index 4ff818f..2840a62 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/BasePigIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/BasePigIT.java
@@ -27,7 +27,7 @@ import java.util.Map;
import java.util.Properties;
import org.apache.hadoop.conf.Configuration;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.end2end.Shadower;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
@@ -42,7 +42,7 @@ import org.junit.BeforeClass;
import com.google.common.collect.Maps;
-public class BasePigIT extends BaseHBaseManagedTimeTableReuseIT {
+public class BasePigIT extends ParallelStatsDisabledIT {
protected TupleFactory tupleFactory;
protected String zkQuorum;
protected Connection conn;
@@ -50,7 +50,7 @@ public class BasePigIT extends BaseHBaseManagedTimeTableReuseIT {
protected PigServer pigServer;
@BeforeClass
- @Shadower(classBeingShadowed = BaseHBaseManagedTimeTableReuseIT.class)
+ @Shadower(classBeingShadowed = ParallelStatsDisabledIT.class)
public static void doSetup() throws Exception {
Map<String,String> props = Maps.newHashMapWithExpectedSize(3);
props.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java b/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
index b7db592..967e320 100644
--- a/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
+++ b/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
@@ -50,7 +50,7 @@ import org.junit.Test;
/**
* Smoke test for query server.
*/
-public class QueryServerBasicsIT extends BaseHBaseManagedTimeTableReuseIT {
+public class QueryServerBasicsIT extends ParallelStatsDisabledIT {
private static final Log LOG = LogFactory.getLog(QueryServerBasicsIT.class);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b5edb6c..242c987 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
<!-- Plugin options -->
<numForkedUT>3</numForkedUT>
- <numForkedIT>5</numForkedIT>
+ <numForkedIT>7</numForkedIT>
<!-- Set default encoding so multi-byte tests work correctly on the Mac -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -227,17 +227,20 @@
<version>${maven-failsafe-plugin.version}</version>
<executions>
<execution>
- <id>ClientManagedTimeTests</id>
+ <id>ParallelStatsEnabledTest</id>
<configuration>
<encoding>UTF-8</encoding>
<forkCount>${numForkedIT}</forkCount>
<runOrder>alphabetical</runOrder>
<reuseForks>true</reuseForks>
- <argLine>-enableassertions -Xmx2000m -XX:MaxPermSize=128m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"</argLine>
+ <runOrder>alphabetical</runOrder>
+ <!--parallel>methods</parallel>
+ <threadCount>20</threadCount-->
+ <argLine>-enableassertions -Xmx3072m -XX:MaxPermSize=256m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled -XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68</argLine>
<redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
- <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory>
- <groups>org.apache.phoenix.end2end.ClientManagedTimeTest</groups>
<shutdown>kill</shutdown>
+ <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory>
+ <groups>org.apache.phoenix.end2end.ParallelStatsEnabledTest</groups>
</configuration>
<goals>
<goal>integration-test</goal>
@@ -245,17 +248,23 @@
</goals>
</execution>
<execution>
- <id>HBaseManagedTimeTests</id>
+ <id>ParallelStatsDisabledTest</id>
<configuration>
+ <!--includes>
+ <include>TenantIdTypeIT</include>
+ </includes-->
<encoding>UTF-8</encoding>
<forkCount>${numForkedIT}</forkCount>
<runOrder>alphabetical</runOrder>
<reuseForks>true</reuseForks>
- <argLine>-enableassertions -Xmx2000m -XX:MaxPermSize=128m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"</argLine>
+ <runOrder>alphabetical</runOrder>
+ <!--parallel>methods</parallel>
+ <threadCount>20</threadCount-->
+ <argLine>-enableassertions -Xmx3072m -XX:MaxPermSize=256m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled -XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68</argLine>
<redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
- <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory>
- <groups>org.apache.phoenix.end2end.HBaseManagedTimeTest</groups>
<shutdown>kill</shutdown>
+ <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory>
+ <groups>org.apache.phoenix.end2end.ParallelStatsDisabledTest</groups>
</configuration>
<goals>
<goal>integration-test</goal>
@@ -263,7 +272,25 @@
</goals>
</execution>
<execution>
- <id>HBaseManagedTimeTableReuseTest</id>
+ <id>ClientManagedTimeTests</id>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <forkCount>${numForkedIT}</forkCount>
+ <runOrder>alphabetical</runOrder>
+ <reuseForks>true</reuseForks>
+ <argLine>-enableassertions -Xmx2000m -XX:MaxPermSize=128m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"</argLine>
+ <redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
+ <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory>
+ <groups>org.apache.phoenix.end2end.ClientManagedTimeTest</groups>
+ <shutdown>kill</shutdown>
+ </configuration>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>HBaseManagedTimeTests</id>
<configuration>
<encoding>UTF-8</encoding>
<forkCount>${numForkedIT}</forkCount>
@@ -272,7 +299,7 @@
<argLine>-enableassertions -Xmx2000m -XX:MaxPermSize=128m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"</argLine>
<redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
<testSourceDirectory>${basedir}/src/it/java</testSourceDirectory>
- <groups>org.apache.phoenix.end2end.HBaseManagedTimeTableReuseTest</groups>
+ <groups>org.apache.phoenix.end2end.HBaseManagedTimeTest</groups>
<shutdown>kill</shutdown>
</configuration>
<goals>
@@ -280,23 +307,23 @@
<goal>verify</goal>
</goals>
</execution>
- <execution>
- <id>NeedTheirOwnClusterTests</id>
- <configuration>
- <encoding>UTF-8</encoding>
- <forkCount>${numForkedIT}</forkCount>
- <runOrder>alphabetical</runOrder>
- <reuseForks>false</reuseForks>
- <argLine>-enableassertions -Xmx2000m -XX:MaxPermSize=256m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"</argLine>
- <redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
- <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory>
- <groups>org.apache.phoenix.end2end.NeedsOwnMiniClusterTest</groups>
- <shutdown>kill</shutdown>
- </configuration>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
+ <execution>
+ <id>NeedTheirOwnClusterTests</id>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <forkCount>${numForkedIT}</forkCount>
+ <runOrder>alphabetical</runOrder>
+ <reuseForks>false</reuseForks>
+ <argLine>-enableassertions -Xmx2000m -XX:MaxPermSize=256m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"</argLine>
+ <redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
+ <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory>
+ <groups>org.apache.phoenix.end2end.NeedsOwnMiniClusterTest</groups>
+ <shutdown>kill</shutdown>
+ </configuration>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
</execution>
</executions>
</plugin>
@@ -394,6 +421,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
+ <!--skip>true</skip-->
<forkCount>${numForkedUT}</forkCount>
<reuseForks>true</reuseForks>
<argLine>-enableassertions -Xmx2250m -XX:MaxPermSize=128m
@@ -927,4 +955,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
[3/3] phoenix git commit: PHOENIX-3268 Upgrade to Tephra 0.9.0
Posted by ja...@apache.org.
PHOENIX-3268 Upgrade to Tephra 0.9.0
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e8ffc9c5
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e8ffc9c5
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e8ffc9c5
Branch: refs/heads/master
Commit: e8ffc9c53513309c249aca740620ecc5df48a26a
Parents: 6b86839
Author: James Taylor <ja...@apache.org>
Authored: Mon Sep 19 07:49:29 2016 -0700
Committer: James Taylor <ja...@apache.org>
Committed: Mon Sep 19 07:49:29 2016 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e8ffc9c5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 242c987..3c000e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
<joni.version>2.1.2</joni.version>
<avatica.version>1.8.0</avatica.version>
<jettyVersion>8.1.7.v20120910</jettyVersion>
- <tephra.version>0.8.0-incubating</tephra.version>
+ <tephra.version>0.9.0-incubating</tephra.version>
<spark.version>1.6.1</spark.version>
<scala.version>2.10.4</scala.version>
<scala.binary.version>2.10</scala.binary.version>
[2/3] phoenix git commit: PHOENIX-3293 Create separate test
categories for stats enabled and disabled
Posted by ja...@apache.org.
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/6b868392
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6b868392
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6b868392
Branch: refs/heads/master
Commit: 6b868392b1ac4c9729d3e9510eb8f9784f5d6a62
Parents: 14d16c8
Author: James Taylor <ja...@apache.org>
Authored: Sat Sep 17 15:20:01 2016 -0700
Committer: James Taylor <ja...@apache.org>
Committed: Sat Sep 17 15:20:01 2016 -0700
----------------------------------------------------------------------
.../phoenix/end2end/AbsFunctionEnd2EndIT.java | 2 +-
.../AlterMultiTenantTableWithViewsIT.java | 2 +-
.../apache/phoenix/end2end/AlterSessionIT.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 | 2 +-
.../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 | 86 +++++++++++++-------
126 files changed, 441 insertions(+), 310 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/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 f053b2f..c70bed2 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/6b868392/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/6b868392/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterSessionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterSessionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterSessionIT.java
index 5ad1f2a..6e0cdd5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterSessionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterSessionIT.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue;
* Basic tests for Alter Session Statements
*
*/
-public class AlterSessionIT extends BaseHBaseManagedTimeTableReuseIT {
+public class AlterSessionIT extends ParallelStatsDisabledIT {
private static final String TABLE_NAME = generateRandomString();
private static Connection testConn;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b868392/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/6b868392/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/6b868392/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/6b868392/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 3f02448..87fdee6 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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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 7466cd3..8de2eda 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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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 52e2a64..0b6a728 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
@@ -62,7 +62,7 @@ import org.junit.Test;
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/6b868392/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/6b868392/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/6b868392/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 3b40d51..d976d23 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,7 +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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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 444cf0d..d092b08 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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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/6b868392/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);