hbase-jruby 0.4.5-java → 0.4.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 317e3299f449c9c5f847ae8118c631d22ff91872
-  data.tar.gz: 092879ce25e3448c5a777310782c7fffab0ba586
+  metadata.gz: 35894372ec9c361c225d9dc621f09769f66c1815
+  data.tar.gz: 4e86e949fd9d8200bf4c790c58988b43dc621db5
 SHA512:
-  metadata.gz: 3454275b00e7636a6d1bedf6b4172ad75f74da839f7bbdb91ac8882604c2e128cef248289abbb276629ed78d4da17834d59844c8fe949cf24bd5d180d3e42433
-  data.tar.gz: 1bb37e732100751e1861605af88f0cf0e1aef988a396a95478bc10af5966c8223bcc9f03bf31529c44846b6cc7b47aa64d2796e5852964e40528ac0a851bba43
+  metadata.gz: d58ba2c67f70d04177b7c36d85739bbbcf54c58f41f74e3fa62a270b02bfc38bd0bf3aaf42c27fc756f004ff2cd7a38f66d2471e5c6babe62b859d7b94182df3
+  data.tar.gz: f61b4bece92dd25907524849d638633c9df30d4fede814b8d0373a937cd410e8e0f967f846d57c3fe28043b2322908a82186affe1649768b6a0c64460bf550d2

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.4.6
+-----
+- [#29 Fix possible HTable leaks](https://github.com/junegunn/hbase-jruby/issues/29)
+- [#30 Make `HBase.log4j=` callable before dependencies are met](https://github.com/junegunn/hbase-jruby/issues/30)
+
 0.4.5
 -----
 - Fixed HBase 0.96 compatibily issues and tested on HBase 0.96 and 0.98

data/lib/hbase-jruby/dependency.rb

@@ -114,6 +114,9 @@ class HBase
         require(jar)
       }
 
+      # Apply pending log4j configuration
+      HBase.log4j = @@log4j if @@log4j
+
       # Try importing Java classes again
       not_found = HBase.import_java_classes!
       if verbose && !not_found.empty?

data/lib/hbase-jruby/hbase.rb

@@ -13,29 +13,34 @@ class HBase
   # @overload HBase.log4j=(filename)
   #   Configure Log4j logging with the given file
   #   @param [String] filename Path to log4j.properties or log4j.xml file
-  #   @return [nil]
+  #   @return [String]
   # @overload HBase.log4j=(hash)
   #   Configure Log4j logging with the given Hash
   #   @param [Hash] hash Log4j properties in Ruby Hash
-  #   @return [nil]
+  #   @return [Hash]
   # @overload HBase.log4j=(props)
   #   Configure Log4j logging with the given Properties
   #   @param [java.util.Properties] props Properties object
-  #   @return [nil]
+  #   @return [java.util.Properties]
   def self.log4j= arg
-    if arg.is_a?(Hash)
-      props = java.util.Properties.new
-      arg.each do |k, v|
-        props.setProperty k.to_s, v.to_s
-      end
-      org.apache.log4j.PropertyConfigurator.configure props
-    else
-      case File.extname(arg).downcase
-      when '.xml'
-        org.apache.log4j.xml.DOMConfigurator.configure arg
+    org.apache.log4j.PropertyConfigurator rescue nil
+    if defined?(org.apache.log4j.PropertyConfigurator)
+      if arg.is_a?(Hash)
+        props = java.util.Properties.new
+        arg.each do |k, v|
+          props.setProperty k.to_s, v.to_s
+        end
+        org.apache.log4j.PropertyConfigurator.configure props
       else
-        org.apache.log4j.PropertyConfigurator.configure arg
+        case File.extname(arg).downcase
+        when '.xml'
+          org.apache.log4j.xml.DOMConfigurator.configure arg
+        else
+          org.apache.log4j.PropertyConfigurator.configure arg
+        end
       end
+    else
+      @@log4j = arg
     end
   end
 
@@ -173,9 +178,21 @@ class HBase
 
 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
 

data/lib/hbase-jruby/table.rb

@@ -29,10 +29,16 @@ class Table
     local_htables[@name] ||= @hbase.send :get_htable, @name
   end
 
-  # @deprecated
+  # Return HTable instance back to the table pool.
+  # Generally this is not required unless you use unlimited number of threads
   # @return [nil]
   def close
-    nil
+    check_closed
+
+    (t = Thread.current[:hbase_jruby]) &&
+    (t = t[@hbase]) &&
+    (t = t.delete @name) &&
+    t.close
   end
 
   # Returns whether if the connection is closed

data/lib/hbase-jruby/version.rb

@@ -1,5 +1,5 @@
 class HBase
 module JRuby
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end
 end

data/lib/hbase-jruby.rb

@@ -2,6 +2,10 @@ unless RUBY_PLATFORM =~ /java/
   raise LoadError, 'Only supports JRuby'
 end
 
+class HBase
+  @@log4j = nil
+end
+
 require 'hbase-jruby/version'
 require 'hbase-jruby/dependency'
 require 'hbase-jruby/util'
@@ -21,4 +25,3 @@ require 'hbase-jruby/table/checked_operation'
 require 'hbase-jruby/row'
 require 'hbase-jruby/hbase'
 
-HBase.import_java_classes!

data/test/test_hbase.rb

@@ -89,10 +89,11 @@ class TestHBase < TestHBaseJRubyBase
     threads = 4.times.map { |i|
       Thread.new {
         ht = hbase2[TABLE].htable
+        sleep
       }
     }
     threads.each do |t|
-      t.join
+      t.kill
       assert t[:hbase_jruby][hbase2][TABLE]
     end
 

data/test/test_table.rb

@@ -23,16 +23,56 @@ class TestTable < TestHBaseJRubyBase
     # 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
 
+  def test_table_close
+    htables = Set.new
+    htables << @hbase[TABLE].htable
+    htables << @hbase[TABLE].htable
+    assert_equal 1, htables.length
+
+    @hbase[TABLE].close
+    htables << @hbase[TABLE].htable
+    htables << @hbase[TABLE].htable
+    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.4.5
+  version: 0.4.6
 platform: java
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.0
+rubygems_version: 2.2.1
 signing_key:
 specification_version: 4
 summary: A JRuby binding for HBase