修正Scan结果最大返回条数代码

AlionSSS · May 26, 2019 · 01d3146 · 01d3146
1 parent 6b5b791
commit 01d3146
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 17 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/src/com/skey/evehbase/client/EveHBase.java b/src/com/skey/evehbase/client/EveHBase.java
@@ -248,12 +248,9 @@ public <T> List<T> scan(@Nonnull EveScan eveScan, @Nonnull Class<T> clazz) throw
 
             // 提交scan请求
             scanner = table.getScanner(eveScan.getScan());
-            int i = 0;
-            long max = eveScan.getMax();
             Result r;
-            while ((r = scanner.next()) != null && i <= max) {
+            while ((r = scanner.next()) != null ) {
                 results.add(r);
-                i++;
             }
 
             if (LOG.isInfoEnabled()) LOG.info("Column value filter successfully.");

diff --git a/src/com/skey/evehbase/request/EveScan.java b/src/com/skey/evehbase/request/EveScan.java
@@ -19,12 +19,10 @@ public class EveScan {
 
     private final Scan scan;
 
-    private final long max;
 
-    EveScan(TableName tableName, Scan scan, long max) {
+    EveScan(TableName tableName, Scan scan) {
         this.tableName = tableName;
         this.scan = scan;
-        this.max = max;
     }
 
     public TableName getTableName() {
@@ -35,10 +33,6 @@ public Scan getScan() {
         return scan;
     }
 
-    public long getMax() {
-        return max;
-    }
-
     public static class Builder {
 
         private String table;

diff --git a/src/com/skey/evehbase/request/EveScanDirector.java b/src/com/skey/evehbase/request/EveScanDirector.java
@@ -37,9 +37,9 @@ static EveScan create(String table, String startRow, String endRow,
 
         TableName tableName = TableName.valueOf(table);
 
-        Scan scan = generateScan(columnMap, startRow, endRow, filter);
+        Scan scan = generateScan(columnMap, startRow, endRow, filter, max);
 
-        return new EveScan(tableName, scan, max);
+        return new EveScan(tableName, scan);
     }
 
     /**
@@ -49,11 +49,14 @@ static EveScan create(String table, String startRow, String endRow,
      * @param startRow  HBase的startRowKey
      * @param endRow    HBase的endRowKey
      * @param filter    HBase的过滤器 {@link Filter}
+     * @param max 结果最大返回条数
      * @return {@link Scan}
      */
-    private static Scan generateScan(Map<String, Set<String>> columnMap, String startRow, String endRow, Filter filter) {
+    private static Scan generateScan(Map<String, Set<String>> columnMap, String startRow, String endRow, Filter filter, long max) {
         Scan scan = new Scan();
 
+        scan.setMaxResultSize(max);
+
         // 添加要查询的列
         for (Map.Entry<String, Set<String>> entry : columnMap.entrySet()) {
             byte[] bFamily = Bytes.toBytes(entry.getKey());