Repository: phoenix Updated Branches: refs/heads/4.0 358043649 -> 276921b65
PHOENIX-1136 Add Integration Tests to verify the fix for PHOENIX-1133 (Kyle Buzsaki) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/276921b6 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/276921b6 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/276921b6 Branch: refs/heads/4.0 Commit: 276921b65ec60dc3aae25ac892f4442934ec93b9 Parents: 3580436 Author: James Taylor <jtay...@salesforce.com> Authored: Wed Aug 6 15:48:16 2014 -0700 Committer: James Taylor <jtay...@salesforce.com> Committed: Wed Aug 6 15:49:23 2014 -0700 ---------------------------------------------------------------------- .../org/apache/phoenix/end2end/SkipScanAfterManualSplitIT.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/276921b6/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 1731917..f09a88e 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 @@ -38,7 +38,6 @@ import org.apache.phoenix.query.ConnectionQueryServices; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -71,7 +70,7 @@ public class SkipScanAfterManualSplitIT extends BaseHBaseManagedTimeIT { // props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, Integer.toString(64)); props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, Integer.toString(32)); // enables manual splitting on salted tables - // props.put(QueryServices.ROW_KEY_ORDER_SALTED_TABLE_ATTRIB, Boolean.toString(false)); + props.put(QueryServices.ROW_KEY_ORDER_SALTED_TABLE_ATTRIB, Boolean.toString(false)); props.put(QueryServices.QUEUE_SIZE_ATTRIB, Integer.toString(1000)); setUpTestDriver(getUrl(), new ReadOnlyProps(props.entrySet().iterator())); } @@ -277,7 +276,6 @@ public class SkipScanAfterManualSplitIT extends BaseHBaseManagedTimeIT { * See PHOENIX-1133 and PHOENIX-1136 on apache JIRA for more details. * @throws java.sql.SQLException from Connection */ - @Ignore @Test public void testSkipScanInListOfRVCAfterManualSplit() throws SQLException { Connection conn = DriverManager.getConnection(getUrl());
