hbase-ruby 1.1.1 → 1.1.2

data/History.txt

@@ -1,3 +1,6 @@
+v1.1.2 Nov 8, 2009
+ * A bug with the timestamps in create_row() was fixed. Also updated specs.
+
 v1.1.1 Nov 7, 2009
 * Improved the scanner functionality. Decided it was worth a version bump and release.
 

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/hbase/client.rb

@@ -24,35 +24,36 @@ module HBase
       @connection.read_timeout = opts[:timeout] if opts[:timeout]
     end
 
-    def get(path)
-      safe_request { @connection.get(@url.path + path, {"Accept" => "application/json"}) }
+    def get(path, options = {})
+      safe_request { @connection.get(@url.path + path, {"Accept" => "application/json"}.merge(options)) }
     end
 
-    # Needed for scanner functionality
-    def get_response(path)
-      safe_response { @connection.get(@url.path + path, {"Accept" => "application/json"}) }
+    def get_response(path, options = {})
+      safe_response { @connection.get(@url.path + path, {"Accept" => "application/json"}.merge(options)) }
     end
 
-    def post(path, data = nil)
-      safe_request { @connection.post(@url.path + path, data, {'Content-Type' => 'text/xml'}) }
+    def post(path, data = nil, options = {})
+      safe_request { @connection.post(@url.path + path, data, {'Content-Type' => 'text/xml'}.merge(options)) }
     end
 
-    # Needed for scanner functionality
-    def post_response(path, data = nil)
-      safe_response { @connection.post(@url.path + path, data, {'Content-Type' => 'text/xml'}) }
+    def post_response(path, data = nil, options = {})
+      safe_response { @connection.post(@url.path + path, data, {'Content-Type' => 'text/xml'}.merge(options)) }
     end
 
-    def delete(path)
-      safe_request { @connection.delete(@url.path + path) }
+    def delete(path, options = {})
+      safe_request { @connection.delete(@url.path + path, options) }
     end
 
-    # Needed for scanner functionality
-    def delete_response(path)
-      safe_response { @connection.delete(@url.path + path) }
+    def delete_response(path, options = {})
+      safe_response { @connection.delete(@url.path + path, options) }
     end
 
-    def put(path, data = nil)
-      safe_request { @connection.put(@url.path + path, data, {'Content-Type' => 'text/xml'}) }
+    def put(path, data = nil, options = {})
+      safe_request { @connection.put(@url.path + path, data, {'Content-Type' => 'text/xml'}.merge(options)) }
+    end
+
+    def put_response(path, data = nil, options = {})
+      safe_response { @connection.put(@url.path + path, data, {'Content-Type' => 'text/xml'}.merge(options)) }
     end
 
     private

data/lib/hbase/operation/meta_operation.rb

@@ -3,7 +3,17 @@ module HBase
     module MetaOperation
       def list_tables
         request = Request::MetaRequest.new
-        tables = Response::MetaResponse.new(get(request.list_tables), :list_tables).parse
+        Response::MetaResponse.new(get(request.list_tables), :list_tables).parse
+      end
+
+      def version
+        request = Request::MetaRequest.new
+        get(request.version, {"Accept" => "text/plain"}).strip
+      end
+
+      def cluster_version
+        request = Request::MetaRequest.new
+        get(request.cluster_version, {"Accept" => "text/plain"}).strip
       end
     end
   end

data/lib/hbase/operation/row_operation.rb

@@ -16,15 +16,17 @@ module HBase
       def show_row(table_name, name, timestamp = nil, columns = nil, options = { })
         begin
           options[:version] ||= 1
+
           request = Request::RowRequest.new(table_name, name, timestamp)
-          row = Response::RowResponse.new(get(request.show(columns, options))).parse.first
+          row = Response::RowResponse.new(get(request.show(columns, options)), :show_row).parse.first
           row.table_name = table_name
           row.timestamp = timestamp
           row
         rescue Net::ProtocolError => e
+          # TODO: Use better handling instead of this.
           if e.to_s.include?("Table")
             raise TableNotFoundError, "Table '#{table_name}' Not Found"
-          elsif e.to_s.include?("Row")
+          elsif e.to_s.include?("404")
             raise RowNotFoundError, "Row '#{name}' Not Found"
           end
         end
@@ -49,19 +51,21 @@ module HBase
           data.each do |d|
             escape_name = d[:name].gsub(/[&<>'"]/) { |match| Converter[match] }
             xml_data << "<Cell "
-            xml_data << "timestamp='#{timestamp}'" if timestamp
+            xml_data << "timestamp='#{timestamp}' " if timestamp
             xml_data << "column='#{[escape_name].pack('m') rescue ''}'>"
             xml_data << "#{[d[:value]].pack("m") rescue ''}"
             xml_data << "</Cell>"
           end
           xml_data << "</Row></CellSet>"
 
-          post(request.create(data.map{|col| col[:name]}), xml_data)
+          Response::RowResponse.new(post_response(request.create(data.map{|col| col[:name]}), xml_data), :create_row).parse
         rescue Net::ProtocolError => e
           if e.to_s.include?("Table")
             raise TableNotFoundError, "Table '#{table_name}' Not Found"
           elsif e.to_s.include?("Row")
             raise RowNotFoundError, "Row '#{name}' Not Found"
+          else
+            raise StandardError, "Error encountered while trying to create row: #{e.message}"
           end
         end
       end
@@ -69,7 +73,7 @@ module HBase
       def delete_row(table_name, name, timestamp = nil, columns = nil)
         begin
           request = Request::RowRequest.new(table_name, name, timestamp)
-          Response::RowResponse.new(delete(request.delete(columns)))
+          Response::RowResponse.new(delete_response(request.delete(columns)), :delete_row).parse
         rescue Net::ProtocolError => e
           if e.to_s.include?("Table")
             raise TableNotFoundError, "Table '#{table_name}' Not Found"

data/lib/hbase/request/meta_request.rb

@@ -12,6 +12,14 @@ module HBase
       def create_table
         @path << "/tables"
       end
+
+      def version
+        @path << "/version"
+      end
+
+      def cluster_version
+        @path << "/version/cluster"
+      end
     end
   end
 end

data/lib/hbase/response/basic_response.rb

@@ -11,6 +11,15 @@ module HBase
       def parse
         parse_content @raw_data
       end
+
+      def verify_success(response)
+        case response
+        when Net::HTTPSuccess
+          true
+        else
+          false
+        end
+      end
     end
   end
 end

data/lib/hbase/response/row_response.rb

@@ -1,30 +1,46 @@
 module HBase
   module Response
     class RowResponse < BasicResponse
+      attr_reader :method
+
+      def initialize(raw_data, method)
+        @method = method
+        super(raw_data)
+      end
+
       def parse_content(raw_data)
-        doc = JSON.parse(raw_data)
-        rows = doc["Row"]
+        case @method
+        when :show_row
+          doc = JSON.parse(raw_data)
+          rows = doc["Row"]
 
-        model_rows = []
-        rows.each do |row|
-          rname = row["key"].strip.unpack("m").first
-          count = row["Cell"].size
-          columns = []
+          model_rows = []
+          rows.each do |row|
+            rname = row["key"].strip.unpack("m").first
+            count = row["Cell"].size
+            columns = []
 
-          row["Cell"].each do |col|
-            name = col["column"].strip.unpack('m').first
-            value = col["$"].strip.unpack('m').first rescue nil
-            timestamp = col["timestamp"].to_i
+            row["Cell"].each do |col|
+              name = col["column"].strip.unpack('m').first
+              value = col["$"].strip.unpack('m').first rescue nil
+              timestamp = col["timestamp"].to_i
 
-            columns << HBase::Model::Column.new(  :name => name,
-                                                  :value => value,
-                                                  :timestamp => timestamp)
+              columns << HBase::Model::Column.new(  :name => name,
+                                                    :value => value,
+                                                    :timestamp => timestamp)
+            end
+
+            model_rows << HBase::Model::Row.new(:name => rname, :total_count => count, :columns => columns)
           end
 
-          model_rows << HBase::Model::Row.new(:name => rname, :total_count => count, :columns => columns)
+          model_rows
+        when :create_row
+          verify_success(raw_data)
+        when :delete_row
+          verify_success(raw_data)
+        else
+          puts "method '#{@method}' not supported yet"
         end
-
-        model_rows
       end
     end
   end

data/lib/hbase/response/scanner_response.rb

@@ -24,7 +24,7 @@ module HBase
         when :get_rows
           # Dispatch it to RowResponse, since that method is made
           # to deal with rows already.
-          RowResponse.new(raw_data).parse
+          RowResponse.new(raw_data, :show_row).parse
         when :close_scanner
           case raw_data
           when Net::HTTPOK

data/spec/hbase/operation/row_operation_spec.rb

@@ -8,12 +8,29 @@ describe HBase::Operation::RowOperation do
     table = @client.create_table("test-hbase-ruby", "col1")
   end
 
-  it "should create two rows called 'row1'" do
+  it "should create a row called 'row1'" do
     lambda {
-      row2 = @client.create_row("test-hbase-ruby", "row1", nil, { :name => "col1:", :value => "row1-col1" })
+      @client.create_row("test-hbase-ruby", "row1", nil, { :name => "col1:", :value => "row1-col1" }).should be_true
     }.should_not raise_error
   end
 
+  it "should create a row named 'row2' with timestamp value" do
+    timestamp = (Time.now - (5*60)).to_i
+    lambda {
+      @client.create_row("test-hbase-ruby", "row2", timestamp, { :name => "col1:cell1", :value => "row2-col1-cell1" }).should be_true
+    }.should_not raise_error
+
+    row = @client.show_row("test-hbase-ruby", "row2")
+    row.should be_a_kind_of(HBase::Model::Row)
+    row.name.should == "row2"
+
+    columns = row.columns
+    columns.size.should == 1
+    columns.first.name.should == "col1:cell1"
+    columns.first.value.should == "row2-col1-cell1"
+    columns.first.timestamp.should == timestamp
+  end
+
   it "should show the rows 'row1'" do
     row = @client.show_row("test-hbase-ruby", "row1")
     row.should.is_a? HBase::Model::Row
@@ -29,8 +46,12 @@ describe HBase::Operation::RowOperation do
 
   it "should delete the rows 'row1'" do
     lambda {
-      row1 = @client.delete_row('test-hbase-ruby', 'row1')
+      row1 = @client.delete_row('test-hbase-ruby', 'row1').should be_true
     }.should_not raise_error
+
+    lambda {
+      row_verify = @client.show_row('test-hbase-ruby', 'row1')
+    }.should raise_error
   end
 
   after :all do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hbase-ruby
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Ye Dingding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-07 00:00:00 -05:00
+date: 2009-11-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency