hipster_sql_to_hbase 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19f2e716a1abcfa1f4dbae04f38a01205f409b74
-  data.tar.gz: 43e9d4b737023c8158f5c6d5ec90b60af3aad919
+  metadata.gz: df0c348233d87ffb7aacd423f8b64d475adb4d38
+  data.tar.gz: a6fb7bf800e3200a90349bfc02dcd412423b2ccc
 SHA512:
-  metadata.gz: 8ac6ac133586ec4ffd03c98cc964b38d6a3f37a29eb2778e99d173a39acd0f64a8f79779e0283d6653eef34d4d6832f3084651af82c3aae16bb9ba9fc7487ea7
-  data.tar.gz: 61d65c9cafbabc5c77db5319405e439f22fcf2e4e9b03fce00e9d6534c189d0cef8f27ae960a4a06a94e349cefdb00e3da6540353839876ef58f0ceeda6aea5a
+  metadata.gz: 9b22c41dd63997b3d537067e4139741620a9b69553f47652cc59625590f95bbac27aff24040457d7b3b4d07f0ded69b3cb76479abe0abefbd41474267e6842a0
+  data.tar.gz: 2e2c362810c8aed1c760dd874e721e0994d2acd67bb552355ff33c6916ffd63efa4ad91082c58abf2e1fa3b2be2c0a7c734659d13f6e2d809cc3c300dd1f0160

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

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.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jean Lescure"]

data/lib/adapter/hbase.rb

@@ -20,6 +20,7 @@ module Hbase
       c_row
     end
     def getRowsByScanner(table,columns,filters,obj={})
+      start_time = Time.now
       scan = HBase::TScan.new
       filters = "(RowFilter(>=, 'binary:0'))" if filters == ''
       scan.filterString = filters
@@ -27,31 +28,25 @@ module Hbase
       
       results = []
       scan_end = false
-      rows = []
       
       while !scan_end
         scan_result = scannerGet(scanner)
         if scan_result.length > 0
-          rows << scan_result[0].row
-        else
-          scan_end = true
-        end
-      end
-      
-      rows.each do |row|
-        row_results = []
-        if columns[0] == '*'
-          getRow(table,row,{})[0].columns.each do |val|
-            row_results << { 'id' => row, val[0] => val[1].value }
+          if columns == '*'
+            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
         else
-          columns.each do |col|
-            row_results << { 'id' => row, col => getRow(table,row,{})[0].columns["#{col}:"].value } rescue row_results << nil
-          end
+          scannerClose(scanner)
+          scan_end = true
         end
-        results << row_results
       end
-      
+#      
+      end_time = Time.now
+      results << (end_time - start_time) * 1000
       results
     end
   end

data/lib/result_tree_to_hbase_converter.rb

@@ -97,8 +97,10 @@ module HipsterSqlToHbase
     
     # Generate a Thrift QualifierFilter and ValueFilter from key value pair.
     def filters_from_key_value_pair(kvp)
+      kvp[:qualifier] = kvp[:column].split(':')
+      kvp[:column] = kvp[:qualifier].shift
       if (kvp[:condition].to_s != "LIKE")
-        "(ValueFilter(#{kvp[:condition]},'binary:#{kvp[:value]}') AND DependentColumnFilter('#{kvp[:column]}',''))"
+        "(SingleColumnValueFilter('#{kvp[:column]}','#{kvp[:qualifier].join(':')}',#{kvp[:condition]},'binary:#{kvp[:value]}',true,true))"
       else
         kvp[:value] = Regexp.escape(kvp[:value])
         kvp[:value].sub!(/^%/,"^.*")
@@ -111,7 +113,7 @@ module HipsterSqlToHbase
         while kvp[:value].match(/([^\\]{1,1})_/)
           kvp[:value].sub!(/([^\\]{1,1})_/,"#{$1}.")
         end
-        "(ValueFilter(=,'regexstring:#{kvp[:value]}') AND DependentColumnFilter('#{kvp[:column]}',''))"
+        "(SingleColumnValueFilter('#{kvp[:column]}','#{kvp[:qualifier].join(':')}',=,'regexstring:#{kvp[:value]}',true,true))"
       end
     end
     

data/lib/sql_parser/sql_limit.treetop

@@ -2,6 +2,6 @@ grammar SQLLimit
   include SQLPrimitives
 
   rule limit
-    "LIMIT" SPACE number { def eval; Limit.new(number.eval); end }
+    "LIMIT" SPACE integer { def eval; integer.eval; end }
   end
 end

metadata

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