Merge pull request #10 from datadrivencz/fix-hbase-scan-limit

[proxima-hbase] fix settings batch size for limitless scans
datadrivencz · Dec 13, 2017 · d4f7618 · d4f7618
2 parents cdac9c8 + 10ec28a
commit d4f7618
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/hbase/hbase-bigtable/pom.xml b/hbase/hbase-bigtable/pom.xml
@@ -51,12 +51,6 @@
               <exclude>cz.o2.proxima:platform-core</exclude>
             </excludes>
           </artifactSet>
-          <relocations>
-            <relocation>
-              <pattern>com.google.</pattern>
-              <shadedPattern>cz.o2.proxima.bigtable.shaded.com.google.</shadedPattern>
-            </relocation>
-          </relocations>
         </configuration>
         <executions>
           <execution>

diff --git a/hbase/hbase-bindings/src/main/java/cz/o2/proxima/storage/hbase/RandomHBaseReader.java b/hbase/hbase-bindings/src/main/java/cz/o2/proxima/storage/hbase/RandomHBaseReader.java
@@ -112,15 +112,14 @@ public void scanWildcard(
       get.setFilter(new ColumnPrefixFilter(
           wildcard.toAttributePrefix().getBytes(UTF8)));
       Scan scan = new Scan(get);
+      if (limit <= 0) {
+        limit = Integer.MAX_VALUE;
+      }
       scan.setBatch(limit);
       if (stroff != null) {
         scan.setFilter(new ColumnPaginationFilter(limit, stroff.off));
       }
 
-      if (limit <= 0) {
-        limit = Integer.MAX_VALUE;
-      }
-
       int accepted = 0;
       try (ResultScanner scanner = client.getScanner(scan)) {
         Result next;