You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by sa...@apache.org on 2016/11/07 21:22:54 UTC
[02/20] phoenix git commit: PHOENIX-3449 Ignore hanging
IndexExtendedIT tests until they can be investigated
PHOENIX-3449 Ignore hanging IndexExtendedIT tests until they can be investigated
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2cfc29d6
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2cfc29d6
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2cfc29d6
Branch: refs/heads/encodecolumns2
Commit: 2cfc29d6620567962ead3b877c47f6c0cbfe360f
Parents: d4f8cc6
Author: James Taylor <ja...@apache.org>
Authored: Fri Nov 4 19:39:19 2016 -0700
Committer: James Taylor <ja...@apache.org>
Committed: Fri Nov 4 21:54:48 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/phoenix/end2end/IndexExtendedIT.java | 11 ++---------
.../phoenix/end2end/index/ReadOnlyIndexFailureIT.java | 5 +----
2 files changed, 3 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/2cfc29d6/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java
index 161dcb8..5c037ed 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexExtendedIT.java
@@ -55,8 +55,8 @@ import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -68,6 +68,7 @@ import com.google.common.collect.Maps;
* Tests for the {@link IndexTool}
*/
@RunWith(Parameterized.class)
+@Category(NeedsOwnMiniClusterTest.class)
public class IndexExtendedIT extends BaseTest {
private final boolean localIndex;
private final boolean transactional;
@@ -130,9 +131,6 @@ public class IndexExtendedIT extends BaseTest {
if (!mutable || transactional) {
return;
}
- if (localIndex) { // FIXME: remove once this test works for local indexes
- return;
- }
String schemaName = generateUniqueName();
String dataTableName = generateUniqueName();
String dataTableFullName = SchemaUtil.getTableName(schemaName, dataTableName);
@@ -205,9 +203,6 @@ public class IndexExtendedIT extends BaseTest {
@Test
public void testSecondaryIndex() throws Exception {
- if (localIndex) { // FIXME: remove once this test works for local indexes
- return;
- }
String schemaName = generateUniqueName();
String dataTableName = generateUniqueName();
String dataTableFullName = SchemaUtil.getTableName(schemaName, dataTableName);
@@ -410,7 +405,6 @@ public class IndexExtendedIT extends BaseTest {
}
// Moved from LocalIndexIT because it was causing parallel runs to hang
- @Ignore
@Test
public void testLocalIndexScanAfterRegionSplit() throws Exception {
// This test just needs be run once
@@ -512,7 +506,6 @@ public class IndexExtendedIT extends BaseTest {
}
// Moved from LocalIndexIT because it was causing parallel runs to hang
- @Ignore
@Test
public void testLocalIndexScanAfterRegionsMerge() throws Exception {
// This test just needs be run once
http://git-wip-us.apache.org/repos/asf/phoenix/blob/2cfc29d6/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ReadOnlyIndexFailureIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ReadOnlyIndexFailureIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ReadOnlyIndexFailureIT.java
index 9d3d4f0..18d1744 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ReadOnlyIndexFailureIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ReadOnlyIndexFailureIT.java
@@ -29,7 +29,6 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -113,11 +112,9 @@ public class ReadOnlyIndexFailureIT extends BaseOwnClusterIT {
serverProps.put("hbase.coprocessor.region.classes", FailingRegionObserver.class.getName());
serverProps.put("hbase.coprocessor.abortonerror", "false");
serverProps.put(Indexer.CHECK_VERSION_CONF_KEY, "false");
- Map<String, String> clientProps =
- Collections.singletonMap(QueryServices.TRANSACTIONS_ENABLED, "true");
NUM_SLAVES_BASE = 4;
setUpTestDriver(new ReadOnlyProps(serverProps.entrySet().iterator()),
- new ReadOnlyProps(clientProps.entrySet().iterator()));
+ ReadOnlyProps.EMPTY_PROPS);
}
@Test