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/11/05 06:18:25 UTC

[4/4] phoenix git commit: PHOENIX-3456 Use unique table names for MutableIndexFailureIT

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/57805e60
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/57805e60
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/57805e60

Branch: refs/heads/4.x-HBase-0.98
Commit: 57805e603fb8d5f51d9ed73bd2beeb7b8b64be0c
Parents: 62aaaf2
Author: James Taylor <ja...@apache.org>
Authored: Fri Nov 4 22:58:44 2016 -0700
Committer: James Taylor <ja...@apache.org>
Committed: Fri Nov 4 22:58:44 2016 -0700

----------------------------------------------------------------------
 .../end2end/index/MutableIndexFailureIT.java       | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/57805e60/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 b968c76..9817f95 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;