bigrecord-driver 0.0.6 → 0.0.7

data/lib/big_record_driver/server.rb

@@ -0,0 +1,123 @@
+require File.dirname(__FILE__) + '/exceptions'
+require File.dirname(__FILE__) + '/column_descriptor'
+require 'drb'
+
+# The name of the java String class conflicts with ruby's String class.
+module Java
+  java_import "java.lang.String"
+  java_import "java.lang.Exception"
+end
+
+class String
+  def to_bytes
+    Java::String.new(self).getBytes
+  end
+end
+
+
+module BigRecord
+  module Driver
+
+    class Server
+      java_import "java.io.IOException"
+
+      def configure(config = {})
+        raise NotImplementedError
+      end
+
+      def update(table_name, row, values, timestamp=nil)
+        raise NotImplementedError
+      end
+
+      def get(table_name, row, column, options={})
+        raise NotImplementedError
+      end
+
+      def get_columns(table_name, row, columns, options={})
+        raise NotImplementedError
+      end
+
+      def get_consecutive_rows(table_name, start_row, limit, columns, stop_row = nil)
+        raise NotImplementedError
+      end
+
+      def delete(table_name, row)
+        raise NotImplementedError
+      end
+
+      def create_table(table_name, column_descriptors)
+        raise NotImplementedError
+      end
+
+      def drop_table(table_name)
+        raise NotImplementedError
+      end
+
+      def truncate_table(table_name)
+        raise NotImplementedError
+      end
+
+      def ping
+        raise NotImplementedError
+      end
+
+      def table_exists?(table_name)
+        raise NotImplementedError
+      end
+
+      def table_names
+        raise NotImplementedError
+      end
+
+      def method_missing(method, *args)
+        super
+      rescue NoMethodError
+        raise NoMethodError, "undefined method `#{method}' for \"#{self}\":#{self.class}"
+      end
+
+      def respond_to?(method)
+        super
+      end
+
+    protected
+
+      def to_ruby_string(byte_string)
+        Java::String.new(byte_string).to_s
+      end
+
+      # Try to recover from network related exceptions. e.g. hbase has been restarted and the
+      # cached connections in @tables are no longer valid. Every method in this class (except connect_table)
+      # should have its code wrapped by a call to this method.
+      def safe_exec
+        yield
+      rescue IOException => e
+        puts "A network error occured: #{e.message}. Trying to recover..."
+        init_connection
+        begin
+          yield
+        rescue Exception, Java::Exception => e2
+          if e2.class == e.class
+            puts "Failed to recover the connection."
+          else
+            puts "Failed to recover the connection but got a different error this time: #{e2.message}."
+          end
+          puts "Stack trace:"
+          puts e2.backtrace.join("\n")
+
+          if e2.kind_of?(NativeException)
+            raise BigRecord::Driver::JavaError, e2.message
+          else
+            raise e2
+          end
+        end
+        puts "Connection recovered successfully..."
+      rescue Exception => e
+        puts "\n#{e.class.name}: #{e.message}"
+        puts e.backtrace.join("\n")
+        raise e
+      end
+
+    end
+
+  end
+end

data/lib/big_record_driver/version.rb

@@ -1,3 +1,5 @@
-module BigRecordDriver
-  VERSION = File.read(File.join(File.dirname(__FILE__), "..", "..", "VERSION")).chomp.freeze
+module BigRecord
+  module Driver
+    VERSION = File.read(File.join(File.dirname(__FILE__), "..", "..", "VERSION")).chomp.freeze
+  end
 end

data/test/abstract_test_client.rb

@@ -1,9 +1,8 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-
+require 'rubygems'
 require 'test/unit'
-require 'big_record_driver'
+require File.dirname(__FILE__) + '/../lib/big_record_driver'
 
-module AbstractTestClient #< Test::Unit::TestCase
+module AbstractTestClient
 
   TABLE_NAME = :animals
 
@@ -286,7 +285,7 @@ module AbstractTestClient #< Test::Unit::TestCase
   def test_ping
     db = nil
     assert_nothing_raised("Couldn't initialize the client") do
-      db = BigRecordDriver::Client.new(:drb_port => 40005)
+      db = BigRecord::Driver::Client.new(:drb_port => PORT)
     end
     assert_not_nil db, "Couldn't initialize the client"
     assert db.ping, "The client was initialized but we cannot communicate with the db itself"
@@ -308,7 +307,7 @@ module AbstractTestClient #< Test::Unit::TestCase
   end
 
   def test_invalid_column_family
-    assert_raises BigRecordDriver::JavaError do
+    assert_raises BigRecord::Driver::JavaError do
       @big_db.get(TABLE_NAME, 'dog-key', 'nonexistentcolumnfamily:name')
     end
   end

data/test/test_client_hbase.rb

@@ -1,26 +1,22 @@
 require File.dirname(__FILE__) + '/abstract_test_client'
 
-class TestHbaseClient < Test::Unit::TestCase #TestClient
+PORT = (ARGV[0] || 40000).to_i
+
+class TestHbaseClient < Test::Unit::TestCase
   include AbstractTestClient
-  # Prepare the connection and the test tables.
-  def setup
-    unless @big_db
-      unless BigRecordDriver::DriverManager.running?(40005)
-        BigRecordDriver::DriverManager.restart(40005)
-      end
 
-      #TODO: don't use hard coded values for the config
-      @big_db = BigRecordDriver::Client.new(:zookeeper_quorum=> 'localhost', :zookeeper_client_port => '2181',:drb_port => 40005)
-    end
+  def setup
+    @big_db = BigRecord::Driver::Client.new({:zookeeper_quorum=> 'localhost', :zookeeper_client_port => '2181', :drb_port => PORT}) unless @big_db
 
     @big_db.drop_table(TABLE_NAME) if @big_db.table_exists?(TABLE_NAME)
 
-    # Create the test table
-    # unless @big_db.table_exists?(TABLE_NAME)
-      columns_descriptors = []
-      columns_descriptors << BigRecordDriver::ColumnDescriptor.new(:columnfamily1)
-      columns_descriptors << BigRecordDriver::ColumnDescriptor.new(:columnfamily2)
-      @big_db.create_table(TABLE_NAME, columns_descriptors)
-    # end
+    columns_descriptors = []
+    columns_descriptors << BigRecord::Driver::ColumnDescriptor.new(:columnfamily1)
+    columns_descriptors << BigRecord::Driver::ColumnDescriptor.new(:columnfamily2)
+    @big_db.create_table(TABLE_NAME, columns_descriptors)
+  end
+
+  def teardown
+    @big_db.drop_table(TABLE_NAME) if @big_db.table_exists?(TABLE_NAME)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bigrecord-driver
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - openplaces.org
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 -05:00
+date: 2010-02-12 00:00:00 -05:00
 default_executable: hbase-driver
 dependencies: []
 
@@ -29,17 +29,15 @@ files:
 - bin/hbase-driver
 - conf/log4j.properties
 - lib/big_record_driver.rb
-- lib/big_record_driver/bigrecord_server.rb
 - lib/big_record_driver/client.rb
 - lib/big_record_driver/column_descriptor.rb
-- lib/big_record_driver/driver_manager.rb
 - lib/big_record_driver/exceptions.rb
 - lib/big_record_driver/hbase_driver/server.rb
+- lib/big_record_driver/server.rb
 - lib/big_record_driver/version.rb
 - lib/bigrecord_driver.rb
 - test/abstract_test_client.rb
 - test/test_client_hbase.rb
-- test/test_driver_manager.rb
 - vendor/java/hbase/commons-logging-1.0.4.jar
 - vendor/java/hbase/commons-logging-api-1.0.4.jar
 - vendor/java/hbase/hadoop-0.20.1-hdfs127-core.jar

data/lib/big_record_driver/bigrecord_server.rb

@@ -1,119 +0,0 @@
-require File.dirname(__FILE__) + '/exceptions'
-require File.dirname(__FILE__) + '/column_descriptor'
-require 'drb'
-# The name of the java String class conflicts with ruby's String class.
-module Java
-  include_class "java.lang.String"
-  include_class "java.lang.Exception"
-
-end
-
-class String
-  def to_bytes
-    Java::String.new(self).getBytes
-  end
-end
-
-
-module BigRecordDriver
-
-class BigRecordServer
-  include_class "java.io.IOException"
-
-  def configure(config = {})
-    raise NotImplementedError
-  end
-
-  def update(table_name, row, values, timestamp=nil)
-    raise NotImplementedError
-  end
-
-  def get(table_name, row, column, options={})
-    raise NotImplementedError
-  end
-
-  def get_columns(table_name, row, columns, options={})
-    raise NotImplementedError
-  end
-
-  def get_consecutive_rows(table_name, start_row, limit, columns, stop_row = nil)
-    raise NotImplementedError
-  end
-
-  def delete(table_name, row)
-    raise NotImplementedError
-  end
-
-  def create_table(table_name, column_descriptors)
-    raise NotImplementedError
-  end
-
-  def drop_table(table_name)
-    raise NotImplementedError
-  end
-
-  def truncate_table(table_name)
-    raise NotImplementedError
-  end
-
-  def ping
-    raise NotImplementedError
-  end
-
-  def table_exists?(table_name)
-    raise NotImplementedError
-  end
-
-  def table_names
-    raise NotImplementedError
-  end
-
-  def method_missing(method, *args)
-    super
-  rescue NoMethodError
-    raise NoMethodError, "undefined method `#{method}' for \"#{self}\":#{self.class}"
-  end
-
-  def respond_to?(method)
-    super
-  end
-
-  protected
-
-    def to_ruby_string(cell)
-      Java::String.new(cell.getValue).to_s
-    end
-    # Try to recover from network related exceptions. e.g. hbase has been restarted and the
-    # cached connections in @tables are no longer valid. Every method in this class (except connect_table)
-    # should have its code wrapped by a call to this method.
-    def safe_exec
-      yield
-    rescue IOException => e
-      puts "A network error occured: #{e.message}. Trying to recover..."
-      init_connection
-      begin
-        yield
-      rescue Exception, Java::Exception => e2
-        if e2.class == e.class
-          puts "Failed to recover the connection."
-        else
-          puts "Failed to recover the connection but got a different error this time: #{e2.message}."
-        end
-        puts "Stack trace:"
-        puts e2.backtrace.join("\n")
-
-        if e2.kind_of?(NativeException)
-          raise BigRecordDriver::JavaError, e2.message
-        else
-          raise e2
-        end
-      end
-      puts "Connection recovered successfully..."
-    rescue Exception => e
-      puts "\n#{e.class.name}: #{e.message}"
-      puts e.backtrace.join("\n")
-      raise e
-    end
-end
-
-end

data/lib/big_record_driver/driver_manager.rb

@@ -1,34 +0,0 @@
-module BigRecordDriver
-
-  class DriverManager
-    class << self
-
-      def set_cmd(db = 'hbase')
-        @@CMD = File.dirname(__FILE__) + "/../../bin/#{db}-driver"
-      end
-      DriverManager.set_cmd
-      def start(port = 40005)
-        `ruby #{@@CMD} start -p #{port.to_s}`
-      end
-
-      def restart(port = 40005)
-        `ruby #{@@CMD} restart -p #{port.to_s}`
-      end
-
-      def stop(port = 40005)
-        `ruby #{@@CMD} stop -p #{port.to_s}`
-      end
-
-      def running?(port = 40005)
-        status = `ruby #{@@CMD} status -p #{port.to_s}`
-        status == "Running.\n"
-      end
-
-      def silent_start(port = 40005)
-        start(port) unless running?(port)
-      end
-    end
-
-  end
-
-end

data/test/test_driver_manager.rb

@@ -1,46 +0,0 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'test/unit'
-require 'big_record_driver'
-
-class TestDriverManager < Test::Unit::TestCase
-
-  # everything is in a sequence and therefore there's only 1 test
-  def test_all
-    port = 40000
-  
-    # stop the driver if it's already running
-    assert_nothing_raised do
-      BigRecordDriver::DriverManager.stop(port) if BigRecordDriver::DriverManager.running?(port)
-    end
-    assert !BigRecordDriver::DriverManager.running?(port), "The driver is already running and it couldn't be stopped"
-
-    # start the real tests
-    assert_nothing_raised do
-      BigRecordDriver::DriverManager.start(port)
-    end
-    assert BigRecordDriver::DriverManager.running?(port), "The driver couldn't be started"
-    
-    assert_nothing_raised do
-      BigRecordDriver::DriverManager.restart(port)
-    end
-    assert BigRecordDriver::DriverManager.running?(port), "The driver couldn't be restarted"
-    
-    assert_nothing_raised("The driver should be able to do a silent start when it's already running") do
-      BigRecordDriver::DriverManager.silent_start(port)
-    end
-    assert BigRecordDriver::DriverManager.running?(port), "The driver stopped during a silent start instead of staying alive"
-
-    assert_nothing_raised do
-      BigRecordDriver::DriverManager.stop(port)
-    end
-    assert !BigRecordDriver::DriverManager.running?(port), "The driver couldn't be stopped"
-    
-    assert_nothing_raised("The driver should be able to do a silent start when it's not running") do
-      BigRecordDriver::DriverManager.silent_start(port)
-    end
-    assert BigRecordDriver::DriverManager.running?(port), "The driver couldn't be started silently"
-
-  end
-  
-end