sishen-hbase-ruby 0.4.6 → 0.5.0

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'hoe'
 
-Hoe.new('sishen-hbase-ruby', '0.4.6') do |p|
+Hoe.new('sishen-hbase-ruby', '0.5.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.4.6"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ye Dingding"]

data/lib/hbase/model/row.rb

@@ -4,6 +4,7 @@ module HBase
       attr_accessor :table_name
       attr_accessor :name
       attr_accessor :timestamp
+      attr_accessor :total_count
       attr_accessor :columns
     end
   end

data/lib/hbase/operation/row_operation.rb

@@ -13,10 +13,10 @@ module HBase
         raise NotImplementedError, "Currently not supported in native hbase client"
       end
 
-      def show_row(table_name, name, timestamp = nil, columns = nil, version = nil)
+      def show_row(table_name, name, timestamp = nil, columns = nil, options = { })
         begin
           request = Request::RowRequest.new(table_name, name, timestamp)
-          row = Response::RowResponse.new(get(request.show(columns, version))).parse
+          row = Response::RowResponse.new(get(request.show(columns, options))).parse
           row.table_name = table_name
           row.name = name
           row.timestamp = timestamp

data/lib/hbase/operation/table_operation.rb

@@ -113,6 +113,8 @@ module HBase
             arg.each do |k,v|
               if Model::ColumnDescriptor::AVAILABLE_OPTS.include? k
                 xml_data << "<#{Model::ColumnDescriptor::AVAILABLE_OPTS[k]}>#{v}</#{Model::ColumnDescriptor::AVAILABLE_OPTS[k]}>"
+              else
+                xml_data << "<metadata><name>#{k}</name><value>#{v}</value></metadata>"
               end
             end
             xml_data << "</columnfamily>"

data/lib/hbase/request/row_request.rb

@@ -12,10 +12,12 @@ module HBase
         super(path)
       end
 
-      def show(columns = nil, version = nil)
+      def show(columns = nil, options = { })
         if columns
           @path << "?#{pack_params(columns)}"
-          @path << "&version=#{version}" if version
+          @path << "&version=#{options[:version]}" if options[:version]
+          @path << "&offset=#{options[:offset]}" if options[:offset]
+          @path << "&limit=#{options[:limit]}" if options[:limit]
         end
         @path
       end

data/lib/hbase/response/row_response.rb

@@ -5,6 +5,7 @@ module HBase
         doc = REXML::Document.new(raw_data)
         row = doc.elements["row"]
         columns = []
+        count = row.elements["count"].text.strip.to_i rescue 0
         row.elements.each("column") do |col|
           name = col.elements["name"].text.strip.unpack("m").first
           value = col.elements["value"].text.strip.unpack("m").first rescue nil
@@ -13,7 +14,7 @@ module HBase
                                        :value => value,
                                        :timestamp => timestamp)
         end
-        Model::Row.new(:columns => columns)
+        Model::Row.new(:total_count => count, :columns => columns)
       end
     end
   end

metadata

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