sishen-hbase-ruby 0.5.0 → 1.0

data/hbase-ruby.gemspec

@@ -1,16 +1,16 @@
 Gem::Specification.new do |s|
   s.name = %q{hbase-ruby}
-  s.version = "0.5.0"
+  s.version = "1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ye Dingding"]
-  s.date = %q{2008-08-09}
+  s.date = %q{2009-03-08}
   s.description = %q{hbase-ruby is a pure ruby client for hbase and enable the ruby app enjoy the power of HBase}
   s.email = %q{yedingding@gmail.com}
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
   s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.txt", "Rakefile", "hbase-ruby.gemspec", "lib/hbase.rb", "lib/hbase/client.rb", "lib/hbase/exception.rb", "lib/hbase/model.rb", "lib/hbase/model/column.rb", "lib/hbase/model/column_descriptor.rb", "lib/hbase/model/region_descriptor.rb", "lib/hbase/model/row.rb", "lib/hbase/model/table_descriptor.rb", "lib/hbase/model/scanner.rb", "lib/hbase/operation/meta_operation.rb", "lib/hbase/operation/row_operation.rb", "lib/hbase/operation/scanner_operation.rb", "lib/hbase/operation/table_operation.rb", "lib/hbase/request.rb", "lib/hbase/request/basic_request.rb", "lib/hbase/request/meta_request.rb", "lib/hbase/request/row_request.rb", "lib/hbase/request/scanner_request.rb", "lib/hbase/request/table_request.rb", "lib/hbase/response.rb", "lib/hbase/response/basic_response.rb", "lib/hbase/response/meta_response.rb", "lib/hbase/response/row_response.rb", "lib/hbase/response/table_response.rb", "lib/hbase/response/scanner_response.rb"]
   s.has_rdoc = true
-  s.homepage = %q{http://sishen.lifegoo.com}
+  s.homepage = %q{http://github.com/sishen}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.2.0}

data/lib/hbase/client.rb

@@ -51,12 +51,13 @@ module HBase
       rescue Errno::ECONNREFUSED
         raise ConnectionNotEstablishedError, "can't connect to #{@url}"
       rescue Timeout::Error => e
+        puts e.backtrace.join("\n")
         raise ConnectionTimeoutError, "execution expired. Maybe query disabled tables"
       end
 
       case response
       when Net::HTTPSuccess
-        response.body.blank? ? response.header : response.body
+        response.body
       else
         response.error!
       end

data/lib/hbase/model/column_descriptor.rb

@@ -4,7 +4,7 @@ module HBase
       NONE = "NONE"
       RECORD = "RECORD"
       BLOCK = "BLOCK"
-      
+
       CTYPES = [NONE, RECORD, BLOCK]
 
       def to_compression_type(type_string)

data/lib/hbase/operation/row_operation.rb

@@ -18,7 +18,6 @@ module HBase
           request = Request::RowRequest.new(table_name, name, timestamp)
           row = Response::RowResponse.new(get(request.show(columns, options))).parse
           row.table_name = table_name
-          row.name = name
           row.timestamp = timestamp
           row
         rescue Net::ProtocolError => e
@@ -34,12 +33,14 @@ module HBase
         begin
           request = Request::RowRequest.new(table_name, name, timestamp)
           data = []
-          if columns.instance_of? Array
-            data = columns
-          elsif columns.instance_of? Hash
-            data = [columns]
-          else
-            raise StandardError, "Only Array or Hash data accepted"
+          if columns
+            if columns.instance_of? Array
+              data = columns
+            elsif columns.instance_of? Hash
+              data = [columns]
+            else
+              raise StandardError, "Only Array or Hash data accepted"
+            end
           end
           xml_data ="<?xml version='1.0' encoding='UTF-8'?><columns>"
           data.each do |d|
@@ -49,7 +50,7 @@ module HBase
           end
           xml_data << "</columns>"
 
-          Response::RowResponse.new(post(request.create, xml_data))
+          post(request.create, xml_data)
         rescue Net::ProtocolError => e
           if e.to_s.include?("Table")
             raise TableNotFoundError, "Table '#{table_name}' Not Found"

data/lib/hbase/operation/scanner_operation.rb

@@ -1,10 +1,12 @@
 module HBase
   module Operation
     module ScannerOperation
-      def open_scanner(table_name, columns, start_row = nil, end_row = nil, timestamp = nil)
+      def open_scanner(table_name, columns, start_row = nil, stop_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
+          scanner = Response::ScannerResponse.new(post(request.open(columns, start_row, stop_row, timestamp))).parse
+          scanner.table_name = table_name
+          scanner
         rescue Net::ProtocolError => e
           if e.to_s.include?("TableNotFoundException")
             raise TableNotFoundError, "Table #{table_name} Not Found!"

data/lib/hbase/operation/table_operation.rb

@@ -73,6 +73,11 @@ module HBase
         end
       end
 
+      def destroy_table(name, columns = nil)
+        disable_table(name)
+        delete_table(name, columns)
+      end
+
       def enable_table(name)
         begin
           request = Request::TableRequest.new(name)

data/lib/hbase/request/scanner_request.rb

@@ -9,11 +9,11 @@ module HBase
         super(path)
       end
 
-      def open(columns, start_row = nil, end_row = nil, timestamp = nil)
+      def open(columns, start_row = nil, stop_row = nil, timestamp = nil)
         search = []
         search << pack_params(columns)
         search << "start_row=#{CGI.escape(start_row)}" if start_row
-        search << "end_row=#{CGI.escape(end_row)}" if end_row
+        search << "stop_row=#{CGI.escape(end_row)}" if stop_row
         search << "timestamp=#{CGI.escape(timestamp)}" if timestamp
 
         @path << "?" << search.join('&')

data/lib/hbase/response/meta_response.rb

@@ -20,7 +20,8 @@ module HBase
           entry = doc.elements["tables"]
           tables = []
           entry.elements.each("table") do |table|
-            t = Model::TableDescriptor.new(:name => table.text.strip)
+            name = table.elements["name"].text.strip rescue nil
+            t = Model::TableDescriptor.new(:name => name)
             tables << t
           end
           tables

data/lib/hbase/response/row_response.rb

@@ -4,9 +4,11 @@ module HBase
       def parse_content(raw_data)
         doc = REXML::Document.new(raw_data)
         row = doc.elements["row"]
+        rname = row.elements["name"].text.strip.unpack("m").first
         columns = []
+        # Need fix in the server side
         count = row.elements["count"].text.strip.to_i rescue 0
-        row.elements.each("column") do |col|
+        row.elements["columns"].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
           timestamp = col.elements["timestamp"].text.strip.to_i
@@ -14,7 +16,7 @@ module HBase
                                        :value => value,
                                        :timestamp => timestamp)
         end
-        Model::Row.new(:total_count => count, :columns => columns)
+        Model::Row.new(:name => rname, :total_count => count, :columns => columns)
       end
     end
   end

data/lib/hbase/response/scanner_response.rb

@@ -2,30 +2,33 @@ module HBase
   module Response
     class ScannerResponse < BasicResponse
       def parse_content(raw_data)
+        puts raw_data
+
         doc = REXML::Document.new(raw_data)
-        doc = doc.elements["rows"] if doc.elements["rows"] && doc.elements["rows"].has_elements?
 
-        rows = []
-        doc.elements.each("row") do |row|
-          row_name = row.elements["name"].text.strip.unpack("m").first
-          columns = []
-          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
-            timestamp = col.elements["timestamp"].text.strip.to_i
-            columns << Model::Column.new(:name => name,
-                                         :value => value,
-                                         :timestamp => timestamp)
+        if doc.elements["/scanner"] && doc.elements["/scanner"].has_elements?
+          scanner = doc.elements["scanner"]
+          id = scanner.elements["id"].text.strip.to_i
+          Model::Scanner.new(:scanner_id => id)
+
+        elsif doc.elements["rows"] && doc.elements["rows"].has_elements?
+          doc = doc.elements["rows"]
+          rows = []
+          doc.elements.each("row") do |row|
+            row_name = row.elements["name"].text.strip.unpack("m").first
+            columns = []
+            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
+              timestamp = col.elements["timestamp"].text.strip.to_i
+              columns << Model::Column.new(:name => name,
+                                           :value => value,
+                                           :timestamp => timestamp)
+            end
+            rows << Model::Row.new(:name => row_name, :columns => columns)
           end
-          rows << Model::Row.new(:name => row_name, :columns => columns)
+          rows
         end
-        rows
-      end
-
-      def get_scanner_id
-        location = @raw_data['location']
-        paths = location.split('/')
-        Model::Scanner.new(:table_name => paths[2], :scanner_id => paths[4])
       end
     end
   end

data/lib/hbase/response/table_response.rb

@@ -12,7 +12,7 @@ module HBase
           compression = columnfamily.elements["compression"].text.strip
           bloomfilter = columnfamily.elements["bloomfilter"].text.strip.to_b
           max_versions = columnfamily.elements["max-versions"].text.strip.to_i
-          maximum_cell_size = columnfamily.elements["maximum-cell-size"].text.strip.to_i
+          maximum_cell_size = columnfamily.elements["max-length"].text.strip.to_i
 
           column_descriptor = Model::ColumnDescriptor.new(:name => colname,
                                                           :compression => Model::CompressionType.to_compression_type(compression),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sishen-hbase-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: "1.0"
 platform: ruby
 authors: 
 - Ye Dingding
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-09 00:00:00 -07:00
+date: 2009-03-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -74,7 +76,7 @@ files:
 - lib/hbase/response/table_response.rb
 - lib/hbase/response/scanner_response.rb
 has_rdoc: true
-homepage: http://sishen.lifegoo.com
+homepage: http://github.com/sishen
 post_install_message: 
 rdoc_options: 
 - --main

data/README.txt

@@ -1,65 +0,0 @@
-hbase-ruby is a pure ruby client for HBase (http://hadoop.apache.org/hbase). It works with the most recent version of HBase REST interface.
-
-== INSTALLTION
-
-$gem sources -a http://gems.github.com
-$gem install sishen-hbase-ruby
-
-For those who wants to use hbase in their rails application, can add this line to the environment.rb:
-{{{
-config.gem 'sishen-hbase-ruby', :lib => "hbase", :source => "http://gems.github.com"
-}}}
-
-To build the gem yourself:
-
-$rake gem
-
-== USAGE
-
-First download the recent version of hbase (svn checkout http://svn.apache.org/repos/asf/hadoop/hbase/trunk hbase), compile it with 'ant', then launch HBase server:
-
-$bin/start-hbase.sh
-
-Here is the example:
-{{{
-require 'hbase'
-
-client = HBase::Client.new("http://localhost:60010/api") # this url is the default.
-
-# Table Operation
-tables = client.list_tables                              # list available tables
-table = client.create_table('users', 'habbit')           # create a table whose column_family is habbit
-table = client.show_table('users')                       # show the meta info of table users 
-client.disable_table('users')                            # disable table users
-client.enable_table('users')                             # enable table users
-client.delete_table('users')                             # delete table users
-
-# Row Operation
-row = client.show_row('users', 'sishen')                 # show the data of row 'sishen' in table 'users'
-row2 = client.create_row('users', 'sishen', Time.now.to_i, {:name => 'habbit:football', :value => 'i like football'}) # create the row 'sishen' with the data in the table 'users'
-client.delete_row('users', 'sishen', nil, 'habbit:football')  # delete the row 'sishen' of table 'users' with the optional column 'habbit:football'
-
-# Scanner Operation
-scanner = client.open_scanner('users', 'habbit:')
-rows = client.get_rows(scanner)
-client.close_scanner(scanner)
-}}}
-
-== Testing
-
-First you want to install rspec gem:
-
-{{{
-	sudo gem install rspec
-  }}}
-
-Now, you can run the spec by following rake task:
-
-{{{
-	rake examples
-  }}}
-
-== Copyright
-
-Copyright (c) 2008 Dingding Ye <yedingding@gmail.com>
-Distributed under MIT License