Merge pull request #189 from oceanbase/add_scan_range_columns

add K Q T to scan range column

Author: WeiXinChan

src/main/java/com/alipay/oceanbase/hbase/OHTable.java

@@ -1928,6 +1928,7 @@ private ObTableQuery buildObTableQuery(ObHTableFilter filter, byte[] start,
         obTableQuery.setIndexName("PRIMARY");
         obTableQuery.sethTableFilter(filter);
         obTableQuery.addKeyRange(obNewRange);
+        obTableQuery.setScanRangeColumns("K", "Q", "T");
         return obTableQuery;
     }
 
@@ -1954,6 +1955,7 @@ private ObTableQuery buildObTableQuery(ObHTableFilter filter, final Scan scan) {
             : configuration.getLong(HConstants.HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE_KEY,
                 HConstants.DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE));
         obTableQuery.setObKVParams(buildOBKVParams(scan));
+        obTableQuery.setScanRangeColumns("K", "Q", "T");
         return obTableQuery;
     }
 
@@ -1979,6 +1981,7 @@ private ObTableQuery buildObTableQuery(final Get get, Collection<byte[]> columnQ
                 get.getTimeRange());
         }
         obTableQuery.setObKVParams(buildOBKVParams(get));
+        obTableQuery.setScanRangeColumns("K", "Q", "T");
         return obTableQuery;
     }
 

src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartScanTest.java

@@ -226,17 +226,11 @@ public static void testScanImpl(String tableName) throws Exception {
             Scan scan = new Scan(keys[1].getBytes(), "putKey".getBytes());
             scan.addFamily(family.getBytes());
             scan.setReversed(true);
-            ResultScanner scanner = hTable.getScanner(scan);
-            List<Cell> cells = getCellsFromScanner(scanner);
-
-            int cellIndex = 0;
-            for (int i = 1; i >= 0; i--) {
-                for (String column : columns) {
-                    AssertKeyValue(keys[i], column, lastTs, latestValue, cells.get(cellIndex));
-                    cellIndex++;
-                }
+            try {
+                hTable.getScanner(scan);
+            } catch (Exception e) {
+                Assert.assertTrue(e.getCause().getMessage().contains("secondary partitioned hbase table with reverse query not supported"));
             }
-            assertEquals(columns.length * 2, cells.size());
         }
         hTable.close();
     }

src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableTimeSeriesScanTest.java

@@ -151,6 +151,7 @@ public static void testScanImpl(String tableName) throws Exception {
         // 4. scan using setStartRow/setEndRow
         {
             Scan scan = new Scan();
+            scan.addFamily(family.getBytes());
             scan.setStartRow(keys[0].getBytes());
             scan.setStopRow(endKey.getBytes());
             ResultScanner scanner = hTable.getScanner(scan);
@@ -173,15 +174,13 @@ public static void testScanImpl(String tableName) throws Exception {
             Scan scan = new Scan(keys[0].getBytes(), endKey.getBytes());
             scan.addFamily(family.getBytes());
             scan.setBatch(batchSize);
-            ResultScanner scanner = hTable.getScanner(scan);
-            Result result = null;
-            int resultSize = (keys.length * columns.length * values.length) / batchSize;
-            for (int i = 0; i < resultSize; i++) {
-                result = scanner.next();
-                Assert.assertEquals(2, result.size());
+            try {
+                ResultScanner scanner = hTable.getScanner(scan);
+            } catch (Exception e) {
+                Assert.assertTrue(e.getCause().getMessage()
+                    .contains("timeseries hbase table with batch query not supported"));
             }
-            result = scanner.next();
-            Assert.assertEquals(null, result);
+            
         }
 
         // 7. scan using setAllowPartialResults/setAllowPartialResults
@@ -190,32 +189,25 @@ public static void testScanImpl(String tableName) throws Exception {
             scan.addFamily(family.getBytes());
             scan.setMaxResultSize(10);
             scan.setAllowPartialResults(true);
-            ResultScanner scanner = hTable.getScanner(scan);
-            int resultSize = keys.length * columns.length * values.length;
-            for (int i = 0; i < resultSize; i++) {
-                Result result = scanner.next();
-                Assert.assertEquals(1, result.size());
+            try {
+                ResultScanner scanner = hTable.getScanner(scan);
+            } catch (Exception e) {
+                Assert.assertTrue(e.getCause().getMessage()
+                    .contains("timeseries hbase table with allow partial results query not supported"));
             }
-            Result result = scanner.next();
-            Assert.assertEquals(null, result);
         }
 
         // 8. scan in reverse
         {
-//            Scan scan = new Scan(keys[2].getBytes(), keys[0].getBytes());
-//            scan.addFamily(family.getBytes());
-//            scan.setReversed(true);
-//            ResultScanner scanner = hTable.getScanner(scan);
-//            List<Cell> cells = getCellsFromScanner(scanner);
-//
-//            int cellIndex = 0;
-//            for (int i = 1; i >= 0; i--) {
-//                for (String column : columns) {
-//                    AssertKeyValue(keys[i], column, lastTs, latestValue, cells.get(cellIndex));
-//                    cellIndex++;
-//                }
-//            }
-//            assertEquals(columns.length * 2, cells.size());
+            Scan scan = new Scan(keys[2].getBytes(), keys[0].getBytes());
+            scan.addFamily(family.getBytes());
+            scan.setReversed(true);
+            try {
+                ResultScanner scanner = hTable.getScanner(scan);
+            } catch (Exception e) {
+                Assert.assertTrue(e.getCause().getMessage()
+                        .contains("timeseries hbase table with reverse query not supported"));
+            }
         }
     }