PHOENIX-2613 Uncomment test
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5d61fb81 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5d61fb81 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5d61fb81 Branch: refs/heads/calcite Commit: 5d61fb818e9dedef00b8d511cde7c3aeca490136 Parents: 9e90fab Author: Samarth <samarth.j...@salesforce.com> Authored: Fri Jan 22 12:22:53 2016 -0800 Committer: Samarth <samarth.j...@salesforce.com> Committed: Fri Jan 22 12:22:53 2016 -0800 ---------------------------------------------------------------------- .../phoenix/filter/SkipScanFilterTest.java | 62 ++++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/5d61fb81/phoenix-core/src/test/java/org/apache/phoenix/filter/SkipScanFilterTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/filter/SkipScanFilterTest.java b/phoenix-core/src/test/java/org/apache/phoenix/filter/SkipScanFilterTest.java index 8ed0add..d691535 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/filter/SkipScanFilterTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/filter/SkipScanFilterTest.java @@ -106,37 +106,37 @@ public class SkipScanFilterTest extends TestCase { public static Collection<Object> data() { List<Object> testCases = Lists.newArrayList(); // Variable length tests -// testCases.addAll( -// foreach(new KeyRange[][]{{ -// PVarchar.INSTANCE.getKeyRange(Bytes.toBytes("a"), true, Bytes.toBytes("a"), true), -// PVarchar.INSTANCE.getKeyRange(Bytes.toBytes("e"), true, Bytes.toBytes("e"), true), -// PVarchar.INSTANCE.getKeyRange(Bytes.toBytes("f"), true, Bytes.toBytes("f"), true), -// }, -// { -// PVarchar.INSTANCE.getKeyRange(Bytes.toBytes("b"), true, Bytes.toBytes("b"), true), -// }, -// { -// KeyRange.EVERYTHING_RANGE, -// }, -// { -// PVarchar.INSTANCE.getKeyRange(Bytes.toBytes("1"), true, Bytes.toBytes("1"), true), -// }}, -// new int[4], -// new Include(ByteUtil.concat(Bytes.toBytes("a"),QueryConstants.SEPARATOR_BYTE_ARRAY, -// Bytes.toBytes("b"), QueryConstants.SEPARATOR_BYTE_ARRAY, -// QueryConstants.SEPARATOR_BYTE_ARRAY, -// Bytes.toBytes("1") ) ), -// new SeekNext(ByteUtil.concat(Bytes.toBytes("e.f"),QueryConstants.SEPARATOR_BYTE_ARRAY, -// Bytes.toBytes("b"), QueryConstants.SEPARATOR_BYTE_ARRAY, -// QueryConstants.SEPARATOR_BYTE_ARRAY, -// Bytes.toBytes("1") ), -// ByteUtil.concat(Bytes.toBytes("f"),QueryConstants.SEPARATOR_BYTE_ARRAY, -// Bytes.toBytes("b") )), -// new Include(ByteUtil.concat(Bytes.toBytes("f"),QueryConstants.SEPARATOR_BYTE_ARRAY, -// Bytes.toBytes("b"), QueryConstants.SEPARATOR_BYTE_ARRAY, -// QueryConstants.SEPARATOR_BYTE_ARRAY, -// Bytes.toBytes("1") ) ) ) -// ); + testCases.addAll( + foreach(new KeyRange[][]{{ + PVarchar.INSTANCE.getKeyRange(Bytes.toBytes("a"), true, Bytes.toBytes("a"), true), + PVarchar.INSTANCE.getKeyRange(Bytes.toBytes("e"), true, Bytes.toBytes("e"), true), + PVarchar.INSTANCE.getKeyRange(Bytes.toBytes("f"), true, Bytes.toBytes("f"), true), + }, + { + PVarchar.INSTANCE.getKeyRange(Bytes.toBytes("b"), true, Bytes.toBytes("b"), true), + }, + { + KeyRange.EVERYTHING_RANGE, + }, + { + PVarchar.INSTANCE.getKeyRange(Bytes.toBytes("1"), true, Bytes.toBytes("1"), true), + }}, + new int[4], + new Include(ByteUtil.concat(Bytes.toBytes("a"),QueryConstants.SEPARATOR_BYTE_ARRAY, + Bytes.toBytes("b"), QueryConstants.SEPARATOR_BYTE_ARRAY, + QueryConstants.SEPARATOR_BYTE_ARRAY, + Bytes.toBytes("1") ) ), + new SeekNext(ByteUtil.concat(Bytes.toBytes("e.f"),QueryConstants.SEPARATOR_BYTE_ARRAY, + Bytes.toBytes("b"), QueryConstants.SEPARATOR_BYTE_ARRAY, + QueryConstants.SEPARATOR_BYTE_ARRAY, + Bytes.toBytes("1") ), + ByteUtil.concat(Bytes.toBytes("f"),QueryConstants.SEPARATOR_BYTE_ARRAY, + Bytes.toBytes("b") )), + new Include(ByteUtil.concat(Bytes.toBytes("f"),QueryConstants.SEPARATOR_BYTE_ARRAY, + Bytes.toBytes("b"), QueryConstants.SEPARATOR_BYTE_ARRAY, + QueryConstants.SEPARATOR_BYTE_ARRAY, + Bytes.toBytes("1") ) ) ) + ); testCases.addAll( foreach(new KeyRange[][]{{ PVarchar.INSTANCE.getKeyRange(Bytes.toBytes("20160116121006"), true, Bytes.toBytes("20160116181006"), true),