sishen-hbase-ruby 0.3.0 → 0.4.0

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'hoe'
 
-Hoe.new('sishen-hbase-ruby', '0.3.0') do |p|
+Hoe.new('sishen-hbase-ruby', '0.4.0') do |p|
   p.rubyforge_name = 'sishen-hbase-ruby'
   p.author = 'Ye Dingding'
   p.email = 'yedingding@gmail.com'

data/hbase-ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{hbase-ruby}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ye Dingding"]

data/lib/hbase/client.rb

@@ -55,7 +55,8 @@ module HBase
       end
 
       case response
-      when Net::HTTPSuccess then response.body
+      when Net::HTTPSuccess
+        response.body.blank? ? response.header : response.body
       else
         response.error!
       end

data/lib/hbase/model.rb

@@ -2,8 +2,6 @@ module HBase
   module Model
     class Record
       def initialize (params)
-        return if params.nil?
-
         params.each do |key, value|
           name = key.to_s
           instance_variable_set("@#{name}", value) if respond_to?(name)
@@ -18,3 +16,4 @@ require 'hbase/model/column_descriptor'
 require 'hbase/model/region_descriptor'
 require 'hbase/model/row'
 require 'hbase/model/table_descriptor'
+require 'hbase/model/scanner'

data/lib/hbase/model/column_descriptor.rb

@@ -4,15 +4,11 @@ module HBase
       NONE = "NONE"
       RECORD = "RECORD"
       BLOCK = "BLOCK"
+      
+      CTYPES = [NONE, RECORD, BLOCK]
 
       def to_compression_type(type_string)
-        case type_string
-        when "NONE"   then NONE
-        when "RECORD" then RECORD
-        when "BLOCK"  then BLOCK
-        else
-          NONE
-        end
+        CTYPES.include?(type_string) ? type_string : NONE
       end
 
       module_function :to_compression_type

data/lib/hbase/operation/scanner_operation.rb

@@ -1,6 +1,48 @@
 module HBase
   module Operation
     module ScannerOperation
+      def open_scanner(table_name, columns, start_row = nil, end_row = nil, timestamp = nil)
+        begin
+          request = Request::ScannerRequest.new(table_name)
+          scanner_id = Response::ScannerResponse.new(post(request.open(columns, start_row, end_row, timestamp))).get_scanner_id
+        rescue Net::ProtocolError => e
+          if e.to_s.include?("TableNotFoundException")
+            raise TableNotFoundError, "Table #{table_name} Not Found!"
+          else
+            raise StandardError, e.to_s
+          end
+        end
+      end
+
+      def get_rows(scanner, limit = 1)
+        begin
+          request = Request::ScannerRequest.new(scanner.table_name)
+          rows = Response::ScannerResponse.new(post(request.get_rows(scanner.scanner_id, limit))).parse
+          rows.each do |row|
+            row.table_name = scanner.table_name
+          end
+          rows
+        rescue StandardError => e
+          if e.to_s.include?("TableNotFoundException")
+            raise TableNotFoundError, "Table #{table_name} Not Found!"
+          else
+            raise StandardError, e.to_s
+          end
+        end
+      end
+
+      def close_scanner(scanner)
+        begin
+          request = Request::ScannerRequest.new(scanner.table_name)
+          Response::ScannerResponse.new(delete(request.close(scanner.scanner_id)))
+        rescue StandardError => e
+          if e.to_s.include?("TableNotFoundException")
+            raise TableNotFoundError, "Table #{table_name} Not Found!"
+          else
+            raise StandardError, e.to_s
+          end
+        end
+      end
     end
   end
 end

data/lib/hbase/request/meta_request.rb

@@ -2,7 +2,7 @@ module HBase
   module Request
     class MetaRequest < BasicRequest
       def initialize
-        super("/")
+        super("")
       end
 
       def list_tables

data/lib/hbase/request/scanner_request.rb

@@ -1,6 +1,38 @@
 module HBase
   module Request
     class ScannerRequest < BasicRequest
+      attr_reader :table_name
+
+      def initialize(table_name)
+        @table_name = CGI.escape(table_name)
+        path = "/#{@table_name}/scanner"
+        super(path)
+      end
+
+      def open(columns, start_row = nil, end_row = nil, timestamp = nil)
+        search = []
+        if columns.is_a? String
+          search << "column=#{columns}"
+        elsif columns.is_a? Array
+          search << columns.collect { |col| "column=#{col}" }.join("&")
+        else
+          raise StandardError, "Only string or array type allowed for columns attr."
+        end
+
+        search << "start_row=#{CGI.escape(start_row)}" if start_row
+        search << "end_row=#{CGI.escape(end_row)}" if end_row
+        search << "timestamp=#{CGI.escape(timestamp)}" if timestamp
+
+        @path << "?" << search.join('&')
+      end
+
+      def get_rows(scanner_id, limit = 1)
+        @path << "/#{scanner_id}?limit=#{limit}"
+      end
+
+      def close(scanner_id)
+        @path << "/#{scanner_id}"
+      end
     end
   end
 end

data/lib/hbase/response.rb

@@ -4,3 +4,4 @@ require 'hbase/response/basic_response'
 require 'hbase/response/meta_response'
 require 'hbase/response/table_response'
 require 'hbase/response/row_response'
+require 'hbase/response/scanner_response'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sishen-hbase-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ye Dingding