增加columnPaginationFilter功能 (#33)

Author: stuBirdFly

src/main/java/com/alipay/oceanbase/hbase/filter/HBaseFilterUtils.java

@@ -40,6 +40,8 @@ public static String toParseableString(Filter filter) {
             return toParseableString((PrefixFilter) filter);
         } else if (filter instanceof FilterList) {
             return toParseableString((FilterList) filter);
+        } else if (filter instanceof ColumnPaginationFilter) {
+            return toParseableString((ColumnPaginationFilter) filter);
         } else if (filter instanceof SkipFilter) {
             return toParseableString((SkipFilter) filter);
         } else if (filter instanceof WhileMatchFilter) {
@@ -112,6 +114,10 @@ private static String toParseableString(PageFilter filter) {
         return filter.getClass().getSimpleName() + '(' + filter.getPageSize() + ')';
     }
 
+    private static String toParseableString(ColumnPaginationFilter filter) {
+        return filter.getClass().getSimpleName() + '(' + filter.getLimit() + ',' + filter.getOffset() + ')';
+    }
+
     private static String toParseableString(ColumnCountGetFilter filter) {
         return filter.getClass().getSimpleName() + '(' + filter.getLimit() + ')';
     }

src/test/java/com/alipay/oceanbase/hbase/HTableTestBase.java

@@ -601,6 +601,22 @@ public void testGetFilter() throws Exception {
         tryPut(hTable, putKey2Column2Value1);
         tryPut(hTable, putKey2Column2Value2);
 
+
+        // show table (time maybe different)
+        //+---------+---------+----------------+--------+
+        //| K         | Q       | T              | V      |
+        //+---------+---------+----------------+--------+
+        //| getKey1 | column1 | -1709714109660 | value1 |
+        //| getKey1 | column1 | -1709714109661 | value2 |
+        //| getKey1 | column1 | -1709714109662 | value1 |
+        //| getKey1 | column2 | -1709714109663 | value1 |
+        //| getKey1 | column2 | -1709714109664 | value2 |
+        //| getKey1 | column2 | -1709714109665 | value1 |
+        //| getKey1 | column2 | -1709714109666 | value2 |
+        //| getKey2 | column2 | -1709714109667 | value1 |
+        //| getKey2 | column2 | -1709714109668 | value2 |
+        //+---------+---------+----------------+--------+
+
         FilterList filterList = new FilterList();
         filterList.addFilter(new ColumnCountGetFilter(1));
         get = new Get(toBytes(key1));
@@ -697,6 +713,18 @@ public void testGetFilter() throws Exception {
         r = hTable.get(get);
         Assert.assertEquals(7, r.raw().length);
 
+        // test empty filter in FilterList
+        filterList = new FilterList();
+        emptyFilterList = new FilterList();
+        filterList.addFilter(emptyFilterList);
+        filterList.addFilter(new ColumnPaginationFilter(3,1));
+        get = new Get(toBytes(key1));
+        get.setMaxVersions(10);
+        get.addFamily(toBytes(family));
+        get.setFilter(filterList);
+        r = hTable.get(get);
+        Assert.assertEquals(1, r.raw().length);
+
         // test empty filter in FilterList
         filterList = new FilterList();
         emptyFilterList = new FilterList();

src/test/java/com/alipay/oceanbase/hbase/filter/HBaseFilterUtilsTest.java

@@ -124,6 +124,12 @@ public void testPageFilter() {
         Assert.assertEquals("PageFilter(128)", HBaseFilterUtils.toParseableString(filter));
     }
 
+    @Test
+    public void testColumnPaginationFilter() {
+        ColumnPaginationFilter filter = new ColumnPaginationFilter(2,2);
+        Assert.assertEquals("ColumnPaginationFilter(2,2)", HBaseFilterUtils.toParseableString(filter));
+    }
+
     @Test
     public void testColumnCountGetFilter() {
         ColumnCountGetFilter filter = new ColumnCountGetFilter(513);
@@ -162,24 +168,27 @@ public void testFilterList() {
         QualifierFilter qualifierFilter = new QualifierFilter(CompareFilter.CompareOp.GREATER,
             new BinaryPrefixComparator("whileMatchFilter".getBytes()));
         SkipFilter skipFilter = new SkipFilter(new PageFilter(128));
+        ColumnPaginationFilter columnPaginationFilter = new ColumnPaginationFilter(2,2);
 
         FilterList filterList = new FilterList(FilterList.Operator.MUST_PASS_ALL);
         filterList.addFilter(rowFilter);
         filterList.addFilter(qualifierFilter);
         filterList.addFilter(skipFilter);
+        filterList.addFilter(columnPaginationFilter);
 
         Assert
             .assertEquals(
                 "(RowFilter(=,'binary:testSkipFilter') "
-                        + "AND QualifierFilter(>,'binaryprefix:whileMatchFilter') AND (SKIP PageFilter(128)))",
+                        + "AND QualifierFilter(>,'binaryprefix:whileMatchFilter') AND (SKIP PageFilter(128)) AND ColumnPaginationFilter(2,2))",
                 HBaseFilterUtils.toParseableString(filterList));
 
         filterList = new FilterList(FilterList.Operator.MUST_PASS_ONE);
         filterList.addFilter(rowFilter);
         filterList.addFilter(qualifierFilter);
+        filterList.addFilter(columnPaginationFilter);
 
         Assert.assertEquals("(RowFilter(=,'binary:testSkipFilter') "
-                            + "OR QualifierFilter(>,'binaryprefix:whileMatchFilter'))",
+                            + "OR QualifierFilter(>,'binaryprefix:whileMatchFilter') OR ColumnPaginationFilter(2,2))",
             HBaseFilterUtils.toParseableString(filterList));
     }
 }