hbase-jruby 0.3.3-java → 0.3.4-java

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.3.4
+-----
+- Cleanup all thread-local (fiber-local) HTable references when connection is closed
+- Added `HBase#reset_table_pool` method for recreating HTable pool
+
 0.3.3
 -----
 

data/lib/hbase-jruby/hbase.rb

@@ -1,4 +1,6 @@
 require 'java'
+require 'set'
+require 'thread'
 
 # @author Junegunn Choi <junegunn.c@gmail.com>
 # @!attribute [r] config
@@ -61,8 +63,10 @@ class HBase
         end
       end
     @htable_pool = HTablePool.new @config, java.lang.Integer::MAX_VALUE
-    @schema = Schema.new
-    @closed = false
+    @threads = Set.new
+    @mutex   = Mutex.new
+    @schema  = Schema.new
+    @closed  = false
   end
 
   # Returns an HBaseAdmin object for administration
@@ -70,10 +74,10 @@ class HBase
   # @yieldparam [org.apache.hadoop.hbase.client.HBaseAdmin] admin
   # @return [org.apache.hadoop.hbase.client.HBaseAdmin]
   def admin
-    check_closed
     if block_given?
       with_admin { |admin| yield admin }
     else
+      check_closed
       HBaseAdmin.new @config
     end
   end
@@ -81,13 +85,12 @@ class HBase
   # Closes HTablePool and connection
   # @return [nil]
   def close
-    unless @closed
-      @htable_pool.close
-      HConnectionManager.deleteConnection(@config, true)
-      if Thread.current[:hbase_jruby]
-        Thread.current[:hbase_jruby].delete(self)
+    @mutex.synchronize do
+      unless @closed
+        @closed = true
+        close_table_pool
+        HConnectionManager.deleteConnection(@config, true)
       end
-      @closed = true
     end
   end
 
@@ -118,7 +121,7 @@ class HBase
   def table table_name
     check_closed
 
-    ht = HBase::Table.send :new, self, @config, @htable_pool, table_name
+    ht = HBase::Table.send :new, self, @config, table_name
 
     if block_given?
       yield ht
@@ -151,9 +154,40 @@ class HBase
       schema[table] = definition
     end
     @schema = schema
+ end
+
+  # Reset underlying HTablePool
+  # @return [nil]
+  def reset_table_pool
+    @mutex.synchronize do
+      close_table_pool
+      @htable_pool = HTablePool.new @config, java.lang.Integer::MAX_VALUE
+    end
+    nil
   end
 
 private
+  def register_thread t
+    @mutex.synchronize do
+      check_closed
+      @threads << t
+    end
+  end
+
+  def close_table_pool
+    # Close all the HTable instances in the pool
+    @htable_pool.close
+
+    # Cleanup thread-local references
+    @threads.each do |thr|
+      thr[:hbase_jruby].delete self
+    end
+  end
+
+  def get_htable name
+    @htable_pool.get_table name
+  end
+
   def check_closed
     raise RuntimeError, "Connection already closed" if closed?
   end

data/lib/hbase-jruby/scoped.rb

@@ -48,8 +48,6 @@ class Scoped
   #   @param [Array<Object>] *rowkeys Rowkeys
   #   @return [Array<HBase::Row>]
   def get rowkeys
-    check_closed
-
     case rowkeys
     when Array
       htable.get(rowkeys.map { |rk| getify rk }).map { |result|
@@ -65,8 +63,6 @@ class Scoped
   # @yield [row] Yields each row in the scope
   # @yieldparam [HBase::Row] row
   def each
-    check_closed
-
     return enum_for(:each) unless block_given?
 
     begin

data/lib/hbase-jruby/table.rb

@@ -22,8 +22,11 @@ class Table
 
     # [:hbase_jruby][HBase connection][Table name]
     local_vars = Thread.current[:hbase_jruby] ||= {}
-    local_htables = local_vars[@hbase] ||= {}
-    local_htables[@name] ||= @pool.get_table(@name)
+    unless local_htables = local_vars[@hbase]
+      @hbase.send :register_thread, Thread.current
+      local_htables = local_vars[@hbase] = {}
+    end
+    local_htables[@name] ||= @hbase.send :get_htable, @name
   end
 
   # @deprecated
@@ -67,8 +70,6 @@ class Table
   #   @param [Hash<Hash>] data Data to put indexed by rowkeys
   #   @return [Fixnum] Number of puts succeeded
   def put *args
-    check_closed
-
     case args.length
     when 1
       puts = args.first.map { |rowkey, props| make_put rowkey, props }
@@ -122,8 +123,6 @@ class Table
   #       ['a002', 'cf1'],
   #       ['a003'])
   def delete *args
-    check_closed
-
     specs = args.first.is_a?(Array) ? args : [args]
 
     htable.delete specs.map { |spec| spec.empty? ? nil : make_delete(*spec) }.compact
@@ -133,8 +132,6 @@ class Table
   # @param [*Object] rowkeys List of rowkeys of rows to delete
   # @return [nil]
   def delete_row *rowkeys
-    check_closed
-
     htable.delete rowkeys.map { |rk| Delete.new(Util.to_bytes rk) }
   end
 
@@ -160,8 +157,6 @@ class Table
   #     table.increment 'a000' => { 'cf1:col1' => 1, 'cf1:col2' => 2 },
   #                     'a001' => { 'cf1:col1' => 3, 'cf1:col2' => 4 }
   def increment rowkey, *args
-    check_closed
-
     if args.empty? && rowkey.is_a?(Hash)
       rowkey.each do |key, spec|
         increment key, spec
@@ -222,10 +217,9 @@ class Table
   end
 
 private
-  def initialize hbase, config, htable_pool, name
+  def initialize hbase, config, name
     @hbase    = hbase
     @config   = config
-    @pool     = htable_pool
     @name     = name.to_s
     @name_sym = name.to_sym
   end

data/lib/hbase-jruby/version.rb

@@ -1,5 +1,5 @@
 class HBase
 module JRuby
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end
 end

data/test/test_hbase.rb

@@ -71,5 +71,61 @@ class TestHBase < TestHBaseJRubyBase
     hbase2 = HBase.new @hbase.config
     assert_equal @hbase.config, hbase2.config
   end
+
+  def test_thread_local_cleanup
+    # Open a new connection
+    hbase2 = HBase.new @hbase.config
+
+    # Thread-local htable cache is empty
+    assert_nil Thread.current[:hbase_jruby][hbase2]
+
+    table = hbase2[TABLE]
+    assert_nil Thread.current[:hbase_jruby][hbase2]
+
+    table.htable
+    # Thread-local htable cache has now been created
+    assert Thread.current[:hbase_jruby][hbase2][TABLE]
+
+    threads = 4.times.map { |i|
+      Thread.new {
+        ht = hbase2[TABLE].htable
+      }
+    }
+    threads.each do |t|
+      t.join
+      assert t[:hbase_jruby][hbase2][TABLE]
+    end
+
+    # Now close the connection
+    hbase2.close
+
+    # Threads-local htable cache deleted
+    assert_nil Thread.current[:hbase_jruby][hbase2]
+    threads.each do |t|
+      assert_nil t[:hbase_jruby][hbase2]
+    end
+
+    # Connection is already closed
+    assert_raise(RuntimeError) { hbase2[TABLE] }
+    assert_raise(RuntimeError) { table.htable  }
+  end
+
+  def test_reset_pool
+    hbase2 = HBase.new @hbase.config
+    table  = hbase2[TABLE]
+
+    htable = table.htable
+    assert_equal htable, table.htable
+    assert_equal htable, hbase2[TABLE.to_sym].htable
+
+    assert_nil hbase2.reset_table_pool
+
+    assert_not_equal htable, table.htable
+    assert_not_equal htable, hbase2[TABLE].htable
+
+    htable = table.htable
+    assert_equal htable, table.htable
+    assert_equal htable, hbase2[TABLE.to_sym].htable
+  end
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hbase-jruby
 version: !ruby/object:Gem::Version
+  version: 0.3.4
   prerelease:
-  version: 0.3.3
 platform: java
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit