PHOENIX-4770 Re-enable pending tests which were ignored during 5.0.0 alpha
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3b1c0d31 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3b1c0d31 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3b1c0d31 Branch: refs/heads/master Commit: 3b1c0d31743bc9d9a4b99d6a0d276c00ddbd837c Parents: 09c017e Author: Ankit Singhal <ankitsingha...@gmail.com> Authored: Fri Jun 1 14:20:40 2018 -0700 Committer: Ankit Singhal <ankitsingha...@gmail.com> Committed: Fri Jun 1 14:20:40 2018 -0700 ---------------------------------------------------------------------- .../phoenix/end2end/IndexScrutinyToolIT.java | 8 +-- .../phoenix/end2end/index/LocalIndexIT.java | 2 - .../schema/types/PDataTypeForArraysTest.java | 54 ++------------------ 3 files changed, 8 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/3b1c0d31/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java index d5c50a1..692a98c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java @@ -40,7 +40,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.google.common.collect.Sets; import org.apache.commons.io.IOUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; @@ -71,18 +70,18 @@ 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 com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import com.google.common.collect.Sets; /** * Tests for the {@link IndexScrutinyTool} */ @Category(NeedsOwnMiniClusterTest.class) @RunWith(Parameterized.class) -@Ignore public class IndexScrutinyToolIT extends BaseTest { private String dataTableDdl; @@ -192,6 +191,7 @@ public class IndexScrutinyToolIT extends BaseTest { * Since CURRENT_SCN is set, the scrutiny shouldn't report any issue. */ @Test + @Ignore("PHOENIX-4378 Unable to set KEEP_DELETED_CELLS to true on RS scanner") public void testScrutinyWhileTakingWrites() throws Exception { int id = 0; while (id < 1000) { http://git-wip-us.apache.org/repos/asf/phoenix/blob/3b1c0d31/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 15d938c..41616f2 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 @@ -71,7 +71,6 @@ import org.apache.phoenix.schema.TableNotFoundException; import org.apache.phoenix.util.QueryUtil; import org.apache.phoenix.util.SchemaUtil; import org.apache.phoenix.util.TestUtil; -import org.junit.Ignore; import org.junit.Test; import com.google.common.collect.Lists; @@ -587,7 +586,6 @@ public class LocalIndexIT extends BaseLocalIndexIT { } @Test - @Ignore public void testLocalIndexAutomaticRepair() throws Exception { if (isNamespaceMapped) { return; } PhoenixConnection conn = DriverManager.getConnection(getUrl()).unwrap(PhoenixConnection.class); http://git-wip-us.apache.org/repos/asf/phoenix/blob/3b1c0d31/phoenix-core/src/test/java/org/apache/phoenix/schema/types/PDataTypeForArraysTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/schema/types/PDataTypeForArraysTest.java b/phoenix-core/src/test/java/org/apache/phoenix/schema/types/PDataTypeForArraysTest.java index 290c80f..792ec6b 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/schema/types/PDataTypeForArraysTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/schema/types/PDataTypeForArraysTest.java @@ -17,6 +17,10 @@ */ package org.apache.phoenix.schema.types; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.math.BigDecimal; import java.sql.Array; import java.sql.Date; @@ -31,57 +35,8 @@ import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.query.QueryConstants; import org.apache.phoenix.schema.SortOrder; -import org.apache.phoenix.schema.types.PArrayDataType; -import org.apache.phoenix.schema.types.PBoolean; -import org.apache.phoenix.schema.types.PBooleanArray; -import org.apache.phoenix.schema.types.PChar; -import org.apache.phoenix.schema.types.PCharArray; -import org.apache.phoenix.schema.types.PDate; -import org.apache.phoenix.schema.types.PDateArray; -import org.apache.phoenix.schema.types.PDecimal; -import org.apache.phoenix.schema.types.PDecimalArray; -import org.apache.phoenix.schema.types.PDouble; -import org.apache.phoenix.schema.types.PDoubleArray; -import org.apache.phoenix.schema.types.PFloat; -import org.apache.phoenix.schema.types.PFloatArray; -import org.apache.phoenix.schema.types.PInteger; -import org.apache.phoenix.schema.types.PIntegerArray; -import org.apache.phoenix.schema.types.PLong; -import org.apache.phoenix.schema.types.PLongArray; -import org.apache.phoenix.schema.types.PSmallint; -import org.apache.phoenix.schema.types.PSmallintArray; -import org.apache.phoenix.schema.types.PTime; -import org.apache.phoenix.schema.types.PTimeArray; -import org.apache.phoenix.schema.types.PTimestamp; -import org.apache.phoenix.schema.types.PTimestampArray; -import org.apache.phoenix.schema.types.PTinyint; -import org.apache.phoenix.schema.types.PTinyintArray; -import org.apache.phoenix.schema.types.PUnsignedDate; -import org.apache.phoenix.schema.types.PUnsignedDateArray; -import org.apache.phoenix.schema.types.PUnsignedDouble; -import org.apache.phoenix.schema.types.PUnsignedDoubleArray; -import org.apache.phoenix.schema.types.PUnsignedFloat; -import org.apache.phoenix.schema.types.PUnsignedFloatArray; -import org.apache.phoenix.schema.types.PUnsignedInt; -import org.apache.phoenix.schema.types.PUnsignedIntArray; -import org.apache.phoenix.schema.types.PUnsignedLong; -import org.apache.phoenix.schema.types.PUnsignedLongArray; -import org.apache.phoenix.schema.types.PUnsignedSmallint; -import org.apache.phoenix.schema.types.PUnsignedSmallintArray; -import org.apache.phoenix.schema.types.PUnsignedTime; -import org.apache.phoenix.schema.types.PUnsignedTimeArray; -import org.apache.phoenix.schema.types.PUnsignedTimestamp; -import org.apache.phoenix.schema.types.PUnsignedTimestampArray; -import org.apache.phoenix.schema.types.PUnsignedTinyint; -import org.apache.phoenix.schema.types.PUnsignedTinyintArray; -import org.apache.phoenix.schema.types.PVarchar; -import org.apache.phoenix.schema.types.PVarcharArray; -import org.apache.phoenix.schema.types.PhoenixArray; -import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.*; - public class PDataTypeForArraysTest { @Test public void testForIntegerArray() { @@ -356,7 +311,6 @@ public class PDataTypeForArraysTest { assertEquals("abx", Bytes.toString(res)); } - @Ignore public void testVariableLengthArrayWithElementsMoreThanShortMax() { String[] strArr = new String[(2 * Short.MAX_VALUE) + 100]; for(int i = 0 ; i < (2 * Short.MAX_VALUE) + 100; i++ ) {
