sishen-hbase-ruby 0.2.8 → 0.3.0

data/README.txt

@@ -16,6 +16,8 @@ require 'hbase'
 client = HBase::Client.new("http://localhost:60010/api") # this url is the default.
 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 
 
 row = client.show_row('users', 'sishen')                 # show the data of row 'sishen' in table 'users'

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'hoe'
 
-Hoe.new('sishen-hbase-ruby', '0.2.6') do |p|
+Hoe.new('sishen-hbase-ruby', '0.3.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.2.8"
+  s.version = "0.3.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

@@ -20,7 +20,7 @@ module HBase
       end
 
       unless @url.path =~ /^\/api/
-        @url += (@url[-1] == '/' ? "api" : "/api")
+        @url.path += (@url.path[-1] == '/' ? "api" : "/api")
       end
 
       # Not actually opening the connection yet, just setting up the persistent connection.
@@ -40,6 +40,10 @@ module HBase
       safe_request { @connection.delete(@url.path + path) }
     end
 
+    def put(path, data = nil)
+      safe_request { @connection.put(@url.path + path, data, {'Content-Type' => 'text/xml'}) }
+    end
+
     private
     def safe_request(&block)
       begin

data/lib/hbase/operation/table_operation.rb

@@ -36,17 +36,34 @@ module HBase
           Response::TableResponse.new(post(request.create, xml_data))
         rescue Net::ProtocolError => e
           if e.to_s.include?("TableExistsException")
-            raise TableExistsError, "Table '#{name} already exists"
+            raise TableExistsError, "Table '#{name}' already exists"
           else
             raise TableFailCreateError, e.message
           end
         end
       end
 
-      def delete_table(name)
+      def alter_table(name, *args)
+        raise StandardError, "Table name must be of type String" unless name.instance_of? String
+
+        request = Request::TableRequest.new(name)
+
+        begin
+          xml_data = construct_xml_stream(name, *args)
+          Response::TableResponse.new(put(request.update, xml_data))
+        rescue Net::ProtocolError => e
+          if e.to_s.include?("TableNotFoundException")
+            raise TableNotFoundError, "Table '#{name}' not exists"
+          else
+            raise TableFailCreateError, e.message
+          end
+        end
+      end
+
+      def delete_table(name, columns = nil)
         begin
           request = Request::TableRequest.new(name)
-          Response::TableResponse.new(delete(request.delete))
+          Response::TableResponse.new(delete(request.delete(columns)))
         rescue Net::ProtocolError => e
           if e.to_s.include?("TableNotFoundException")
             raise TableNotFoundError, "Table '#{name}' not exists"
@@ -84,6 +101,29 @@ module HBase
 
       def table_regions(name, start_row = nil, end_row = nil)
       end
+
+      private
+      def construct_xml_stream(name, *args)
+        xml_data = "<?xml version='1.0' encoding='UTF-8'?><table><name>#{name}</name><columnfamilies>"
+        for arg in args
+          if arg.instance_of? String
+            xml_data << "<columnfamily><name>#{arg}</name></columnfamily>"
+          elsif arg.instance_of? Hash
+            xml_data << "<columnfamily>"
+            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]}>"
+              end
+            end
+            xml_data << "</columnfamily>"
+          else
+            raise StandardError, "#{arg.class.to_s} of #{arg.to_s} is not of Hash Type"
+          end
+        end
+        xml_data << "</columnfamilies></table>"
+
+        xml_data
+      end
     end
   end
 end

data/lib/hbase/request/table_request.rb

@@ -21,6 +21,10 @@ module HBase
         @path << "/"
       end
 
+      def update
+        @path << "/#{name}"
+      end
+
       def enable
         @path << "/#{name}/enable"
       end
@@ -29,8 +33,19 @@ module HBase
         @path << "/#{name}/disable"
       end
 
-      def delete
+      def delete(columns = nil)
         @path << "/#{name}"
+        if columns
+          if columns.is_a? String
+            columns = [columns]
+          elsif columns.is_a? Array
+          else
+            raise StandardError, "Only String or Array type allows for columns"
+          end
+          params = columns.collect { |column| "column=#{column}" }.join('%')
+          @path << "?#{params}"
+        end
+        @path
       end
     end
   end

metadata

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