Repository: phoenix Updated Branches: refs/heads/master 77ab7dfa2 -> 10c81438b
PHOENIX-3456 Use unique table names for MutableIndexFailureIT Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d5b8016d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d5b8016d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d5b8016d Branch: refs/heads/master Commit: d5b8016db1a9648f83455942cdd0179b9d5981ab Parents: 77ab7df Author: James Taylor <[email protected]> Authored: Fri Nov 4 22:58:44 2016 -0700 Committer: James Taylor <[email protected]> Committed: Fri Nov 4 23:20:14 2016 -0700 ---------------------------------------------------------------------- .../end2end/index/MutableIndexFailureIT.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d5b8016d/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java index 4263890..687b2c2 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java @@ -43,9 +43,9 @@ import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver; import org.apache.hadoop.hbase.regionserver.MiniBatchOperationInProgress; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.phoenix.end2end.BaseOwnClusterIT; import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest; import org.apache.phoenix.jdbc.PhoenixConnection; +import org.apache.phoenix.query.BaseTest; import org.apache.phoenix.query.QueryConstants; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.schema.PIndexState; @@ -56,6 +56,7 @@ import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.SchemaUtil; import org.apache.phoenix.util.StringUtil; import org.apache.phoenix.util.TestUtil; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -74,20 +75,26 @@ import com.google.common.collect.Maps; @Category(NeedsOwnMiniClusterTest.class) @RunWith(Parameterized.class) -public class MutableIndexFailureIT extends BaseOwnClusterIT { - public static volatile boolean FAIL_WRITE = false; +public class MutableIndexFailureIT extends BaseTest { public static final String INDEX_NAME = "IDX"; + + public static volatile boolean FAIL_WRITE = false; + public static volatile String fullTableName; private String tableName; private String indexName; - public static volatile String fullTableName; private String fullIndexName; private final boolean transactional; private final boolean localIndex; private final String tableDDLOptions; private final boolean isNamespaceMapped; - private String schema = "TEST"; + private String schema = generateUniqueName(); + + @AfterClass + public static void doTeardown() throws Exception { + tearDownMiniCluster(); + } public MutableIndexFailureIT(boolean transactional, boolean localIndex, boolean isNamespaceMapped) { this.transactional = transactional;
