hipster_sql_to_hbase 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bc7e0fadc9bd39437ea73714c653ec0377b8a7d
-  data.tar.gz: 9b85004f1f55df39cf4edf80cac0754fee31be57
+  metadata.gz: 21aa3a9f2162b1887138ca8e123895d18a474c58
+  data.tar.gz: c7a905d57e231b9368d389fb59632d45c450676b
 SHA512:
-  metadata.gz: 610c323c98794ff3ebc804388aa857a8179b27339f4f1de3f79cba8f9d3a3d2801b51a6b1449f1d63c05185d42a236109a9dfceb8f1e8440873f550ede460de2
-  data.tar.gz: 1e6bb0a3e95843438981a57e7c50275924acf3423b1783e044017b3f79ef309bcfb70df37c88ac58c6beeccadc9bbff2d5d758644a6631937306e33247d21c04
+  metadata.gz: a3e3a61c3eeb144623e2d8e1681413ddaf875b4fa5f8ad7f3e5ec1bcfa6aa286e40ea064039056ffda8a0f4376bdc8548ef48287ba94a45b5aa2fb35b765af96
+  data.tar.gz: ec656c0165aefa7f856541246e9133b7e8f7ae62b2f41d5fba2dfac1489da1a9fc46b3de88b99a1cb2270239ba1307c48aad4f82d42f5ce2a39c3385ff4dfbe7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/hipster_sql_to_hbase.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "hipster_sql_to_hbase"
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jean Lescure"]

data/lib/adapter/hbase.rb

@@ -19,28 +19,23 @@ module Hbase
       mutateRow('table_indices','0',[HBase::Mutation.new(column: table_name, value: n_row.to_s)],{})
       c_row
     end
-    def getRowsByScanner(table,columns,filters,obj={})
+    def getRowsByScanner(table,columns,filters,limit,obj={})
       scan = HBase::TScan.new
       filters = "(RowFilter(>=, 'binary:0'))" if filters == ''
       scan.filterString = filters
       scanner = scannerOpenWithScan(table, scan, obj)
       
       results = []
-      scan_end = false
+      scan_limit = limit || 100000
       
-      while !scan_end
-        scan_result = scannerGet(scanner)
-        if scan_result.length > 0
-          if columns[0] == '*'
-            results << scan_result[0].columns.each{ |k,v| scan_result[0].columns[k] = v.value }
-          else
-            row_result = {}
-            columns.each{ |k| row_result[k] = scan_result[0].columns[k].value }
-            results << row_result
-          end
+      rows = scannerGetList(scanner, scan_limit)
+      rows.each do |row|
+        if columns[0] == '*'
+          results << row.columns.each{ |k,v| row.columns[k] = v.value }
         else
-          scannerClose(scanner)
-          scan_end = true
+          row_result = {}
+          columns.each{ |k| row_result[k] = row.columns[k].value }
+          results << row_result
         end
       end
       

data/lib/result_tree_to_hbase_converter.rb

@@ -56,8 +56,9 @@ module HipsterSqlToHbase
       thrift_table = hash[:from]
       thrift_columns = hash[:select]
       thrift_filters = recurse_where(hash[:where] || [])
+      thrift_limit = hash[:limit]
       
-      HipsterSqlToHbase::ThriftCallGroup.new([{:method => thrift_method,:arguments => [thrift_table,thrift_columns,thrift_filters,{}]}])
+      HipsterSqlToHbase::ThriftCallGroup.new([{:method => thrift_method,:arguments => [thrift_table,thrift_columns,thrift_filters,thrift_limit,{}]}])
     end
     
     # When SQL sentence is a CREATE TABLE query generate the Thrift column descriptors/families

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hipster_sql_to_hbase
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Jean Lescure