hbase-jruby 0.6.1-java → 0.6.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f32321b68a2ef60bd0f6204024a66f2128cfa063
-  data.tar.gz: 09db1b0e3acde863d431e2ab53b56a300d728a2e
+  metadata.gz: 45fb6da67d84e5b2640f383441c9c5a97368acff
+  data.tar.gz: 4ca5274110f4a56277dd5671e6e8f35524214e16
 SHA512:
-  metadata.gz: ccadd29f6013b881ae8293958d62bede38a735f649fb558e2baced52ce48ef830222fe4bcc9fc74285c70eff9b23f7a3bf19802dd8a01f59c1e2f5760df7b44b
-  data.tar.gz: 106a15062df3e5c9c04d1dd9a906c130d1bd4cfd2621f33166bc7d30d0c0816777ec651b89459494fcce0547b822d1750bff231a5cc327be185f3fd2efe0eb6a
+  metadata.gz: 068015d5dcdf8f374251f31571b7549b0fb77ad82c915e6218d564705e547f365647466d45c21027bffd895e48128e20743b6f759d7497fdf77034b3cb858013
+  data.tar.gz: 6bbdbbb27743a7da0e079de10566b9adbad77e9866beeb560f697f97987233fff21c3ad428ad0e6fb8dbc2e32b72f245c0431f9f5b26afdae69b3ec10fb4c613

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+0.6.2
+-----
+
+- Removed automatic cleanup of thread-local HTable instances
+    - Fixes issue #35
+    - Close of individual HTable instance turned out to be unnecessary
+        - `flushCommits` not required as `hbase-jruby` runs in auto-flush mode
+        - No need to close shared connection or its thread pool
+
 0.6.1
 -----
 

data/lib/hbase-jruby/hbase.rb

@@ -74,7 +74,6 @@ class HBase
       else
         HTablePool.new @config, java.lang.Integer::MAX_VALUE
       end
-    @threads = Set.new
     @mutex   = Mutex.new
     @schema  = Schema.new
     @closed  = false
@@ -107,7 +106,6 @@ class HBase
       unless @closed
         @closed = true
         @htable_pool.close if use_table_pool?
-        clear_thread_locals
         @connection.close
 
         # To be deprecated
@@ -190,7 +188,6 @@ class HBase
     raise RuntimeError, 'Not using table pool' unless use_table_pool?
 
     @mutex.synchronize do
-      clear_thread_locals
       @htable_pool.close
       @htable_pool = HTablePool.new @config, java.lang.Integer::MAX_VALUE
     end
@@ -198,32 +195,6 @@ class HBase
   end
 
 private
-  def register_thread t
-    # (NOTE) The cleanup routine can be inefficient when the number of
-    # concurrent threads becomes large. However, since it is not likely that
-    # there will be more than a few hundred threads in a typical JRuby process
-    # and the code is executed only once per thread, let's simply assume that
-    # it's okay.
-    @mutex.synchronize do
-      check_closed
-      @threads << t
-      alives, deads = @threads.partition { |e| e.alive? }
-      @threads = Set.new(alives)
-      deads.each do |dead|
-        (dead[:hbase_jruby].delete(self) || {}).each do |_, htable|
-          htable.close rescue nil
-        end
-      end
-    end
-  end
-
-  def clear_thread_locals
-    # Cleanup thread-local references
-    @threads.each do |thr|
-      thr[:hbase_jruby].delete self
-    end
-  end
-
   def get_htable name
     (@htable_pool || @connection).get_table name
   end

data/lib/hbase-jruby/table.rb

@@ -23,7 +23,6 @@ class Table
     # [:hbase_jruby][HBase connection][Table name]
     local_vars = Thread.current[:hbase_jruby] ||= {}
     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

data/lib/hbase-jruby/version.rb

@@ -1,5 +1,5 @@
 class HBase
 module JRuby
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end
 end

data/test/test_hbase.rb

@@ -34,8 +34,6 @@ class TestHBase < TestHBaseJRubyBase
     assert @hbase.closed?
     assert table.closed?
 
-    assert !Thread.current[:hbase_jruby].has_key?(@hbase)
-
     assert_raise(RuntimeError) { @hbase.list }
     assert_raise(RuntimeError) { table.exists? }
     assert_raise(RuntimeError) { table.drop! }
@@ -110,12 +108,6 @@ class TestHBase < TestHBaseJRubyBase
     # 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  }

data/test/test_table.rb

@@ -20,20 +20,6 @@ class TestTable < TestHBaseJRubyBase
     end
     assert_equal 1, htables.uniq.length
 
-    # Multi-threaded
-    htables = []
-    table = @hbase.table(TABLE)
-    nthr = num_managed_threads
-    4.times do
-      Thread.new {
-        htables << table.htable
-        assert_equal nthr + 1, num_managed_threads
-      }.join
-    end
-    assert_equal 4, htables.uniq.length
-    # XXX Implementation detail
-    assert_equal nthr + 1, num_managed_threads
-
     assert_equal @hbase.table(TABLE).htable, @hbase[TABLE].htable
   end
 
@@ -49,30 +35,6 @@ class TestTable < TestHBaseJRubyBase
     assert_equal 2, htables.length
   end
 
-  def num_managed_threads
-    @hbase.instance_variable_get(:@threads).length
-  end
-
-  # FIXME
-  # - Implementation detail
-  # - Naive assertion
-  # - Race condition
-  def test_autoclose_htables
-    nthr = num_managed_threads
-    threads = 50.times.map { |i|
-      Thread.new {
-        @hbase[TABLE].htable
-        sleep 0.5
-      }
-    }
-    sleep 1
-    assert num_managed_threads > nthr
-
-    nthr = num_managed_threads
-    Thread.new { @hbase[TABLE].htable }.join
-    assert num_managed_threads < nthr
-  end
-
   def test_put_then_get
     row1 = next_rowkey.to_s
     row2 = next_rowkey.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hbase-jruby
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: java
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit