hbase-jruby 0.4.6-java → 0.5.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35894372ec9c361c225d9dc621f09769f66c1815
-  data.tar.gz: 4e86e949fd9d8200bf4c790c58988b43dc621db5
+  metadata.gz: 38719a45c5f33a6b3ea5841b32325eec7e709ebf
+  data.tar.gz: cc3634b8218d60809d86256819eb8b6657dcad63
 SHA512:
-  metadata.gz: d58ba2c67f70d04177b7c36d85739bbbcf54c58f41f74e3fa62a270b02bfc38bd0bf3aaf42c27fc756f004ff2cd7a38f66d2471e5c6babe62b859d7b94182df3
-  data.tar.gz: f61b4bece92dd25907524849d638633c9df30d4fede814b8d0373a937cd410e8e0f967f846d57c3fe28043b2322908a82186affe1649768b6a0c64460bf550d2
+  metadata.gz: 11aebd9b28bce00bb7130197c9b9b55d59311cecd38d1711fef0703d62833db234a3e224d365df153c63c1fd9d1b638df57185dc988412d6c91c1596b1c476ae
+  data.tar.gz: a375d7bc7e45c61c8c3f2613feacd05e83714b7992dd061f8c13ece2c8587e7f6590b9e18d02252e6aa8c979ae9fb9fdc439f035487feb7e6fb7b66004c8fe1e

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+0.5.0
+-----
+- Added CDH5.0 (HBase 0.96.1.1) and CDH4.6 dependency profiles
+    - If you share HBase instance between threads, you may need to set
+      `hbase.hconnection.threads.core` due to
+      [a bug](https://issues.apache.org/jira/browse/HBASE-10449) in CDH5.5.0.
+- Use HConnection instead of deprecated HTablePool when possible
+
 0.4.6
 -----
 - [#29 Fix possible HTable leaks](https://github.com/junegunn/hbase-jruby/issues/29)

data/README.md

@@ -152,20 +152,21 @@ or by `require`ing relevant JAR files after launching JRuby.
 Well, there's an easier way.
 Call `HBase.resolve_dependency!` helper method passing one of the arguments listed below.
 
-| Argument   | Dependency               | Default version  | Required executable |
-| ---------- | ------------------------ | ---------------  | ------------------- |
-| cdh4.5[.*] | Cloudera CDH4.5          | cdh4.5.0         | mvn                 |
-| cdh4.4[.*] | Cloudera CDH4.4          | cdh4.4.0         | mvn                 |
-| cdh4.3[.*] | Cloudera CDH4.3          | cdh4.3.2         | mvn                 |
-| cdh4.2[.*] | Cloudera CDH4.2          | cdh4.2.2         | mvn                 |
-| cdh4.1[.*] | Cloudera CDH4.1          | cdh4.1.5         | mvn                 |
-| cdh3[u*]   | Cloudera CDH3            | cdh3u6           | mvn                 |
-| 0.98[.*]   | Apache HBase 0.98        | 0.98.0-hadoop2   | mvn                 |
-| 0.96[.*]   | Apache HBase 0.96        | 0.96.1.1-hadoop2 | mvn                 |
-| 0.94[.*]   | Apache HBase 0.94        | 0.94.16          | mvn                 |
-| 0.92[.*]   | Apache HBase 0.92        | 0.92.2           | mvn                 |
-| *POM PATH* | Custom Maven POM file    | -                | mvn                 |
-| `:local`   | Local HBase installation | -                | hbase               |
+| Argument   | Dependency               | Default version | Required executable |
+| ---------- | ------------------------ | --------------- | ------------------- |
+| cdh5.0[.*] | Cloudera CDH5.0          | cdh5.0.0        | mvn                 |
+| cdh4.5[.*] | Cloudera CDH4.5          | cdh4.5.0        | mvn                 |
+| cdh4.4[.*] | Cloudera CDH4.4          | cdh4.4.0        | mvn                 |
+| cdh4.3[.*] | Cloudera CDH4.3          | cdh4.3.2        | mvn                 |
+| cdh4.2[.*] | Cloudera CDH4.2          | cdh4.2.2        | mvn                 |
+| cdh4.1[.*] | Cloudera CDH4.1          | cdh4.1.5        | mvn                 |
+| cdh3[u*]   | Cloudera CDH3            | cdh3u6          | mvn                 |
+| 0.98[.*]   | Apache HBase 0.98        | 0.98.0-hadoop2  | mvn                 |
+| 0.96[.*]   | Apache HBase 0.96        | 0.96.2-hadoop2  | mvn                 |
+| 0.94[.*]   | Apache HBase 0.94        | 0.94.18         | mvn                 |
+| 0.92[.*]   | Apache HBase 0.92        | 0.92.2          | mvn                 |
+| *POM PATH* | Custom Maven POM file    | -               | mvn                 |
+| `:local`   | Local HBase installation | -               | hbase               |
 
 (Default version is used when an argument prefix is given without specific patch version.
  e.g. `cdh4.2` defaults to `cdh4.2.2`)
@@ -1100,6 +1101,22 @@ end
 
 ## Advanced topics
 
+### Thread-safety
+
+You can freely share a `HBase::Table` instance among threads, as it is backed by
+thread-local HTable instances. ([HTable instance in itself is not
+thread-safe](https://hbase.apache.org/book/client.html))
+
+```ruby
+table = hbase[:my_table]
+
+10.times.map do |i|
+  Thread.new do
+    table.put i, data
+  end
+end.each(&:join)
+```
+
 ### Lexicographic scan order
 
 HBase stores rows in the lexicographic order of the rowkeys in their byte array

data/lib/hbase-jruby/dependency.rb

@@ -12,6 +12,8 @@ class HBase
   # https://ccp.cloudera.com/display/SUPPORT/CDH+Downloads
   SUPPORTED_PROFILES = {
     # Prefix => Latest known version
+    'cdh5.0' => 'cdh5.0.0',
+    'cdh4.6' => 'cdh4.6.0',
     'cdh4.5' => 'cdh4.5.0',
     'cdh4.4' => 'cdh4.4.0',
     'cdh4.3' => 'cdh4.3.2',
@@ -19,9 +21,9 @@ class HBase
     'cdh4.1' => 'cdh4.1.5',
     'cdh3'   => 'cdh3u6',
     '0.98'   => '0.98.0-hadoop2',
-    '0.96'   => '0.96.1.1-hadoop2',
+    '0.96'   => '0.96.2-hadoop2',
     '0.95'   => '0.95.2-hadoop2',
-    '0.94'   => '0.94.16',
+    '0.94'   => '0.94.18',
     '0.92'   => '0.92.2',
   }
 

data/lib/hbase-jruby/hbase.rb

@@ -67,13 +67,26 @@ class HBase
           end
         end
       end
-    @htable_pool = HTablePool.new @config, java.lang.Integer::MAX_VALUE
+    @connection = HConnectionManager.createConnection @config
+    @htable_pool =
+      if @connection.respond_to?(:getTable)
+        nil
+      else
+        HTablePool.new @config, java.lang.Integer::MAX_VALUE
+      end
     @threads = Set.new
     @mutex   = Mutex.new
     @schema  = Schema.new
     @closed  = false
   end
 
+  # Returns if this instance is backed by an HTablePool which is deprecated
+  # in the recent versions of HBase
+  # @return [Boolean]
+  def use_table_pool?
+    !@htable_pool.nil?
+  end
+
   # Returns an HBaseAdmin object for administration
   # @yield [admin] An HBaseAdmin object
   # @yieldparam [org.apache.hadoop.hbase.client.HBaseAdmin] admin
@@ -93,13 +106,17 @@ class HBase
     @mutex.synchronize do
       unless @closed
         @closed = true
-        close_table_pool
+        @htable_pool.close if use_table_pool?
+        clear_thread_locals
+        @connection.close
+
+        # To be deprecated
         begin
           HConnectionManager.deleteConnection(@config)
         rescue ArgumentError
           # HBase 0.92 or below
           HConnectionManager.deleteConnection(@config, true)
-        end
+        end if use_table_pool?
       end
     end
   end
@@ -167,10 +184,14 @@ class HBase
  end
 
   # Reset underlying HTablePool
+  # @deprecated
   # @return [nil]
   def reset_table_pool
+    raise RuntimeError, 'Not using table pool' unless use_table_pool?
+
     @mutex.synchronize do
-      close_table_pool
+      clear_thread_locals
+      @htable_pool.close
       @htable_pool = HTablePool.new @config, java.lang.Integer::MAX_VALUE
     end
     nil
@@ -196,10 +217,7 @@ private
     end
   end
 
-  def close_table_pool
-    # Close all the HTable instances in the pool
-    @htable_pool.close
-
+  def clear_thread_locals
     # Cleanup thread-local references
     @threads.each do |thr|
       thr[:hbase_jruby].delete self
@@ -207,7 +225,7 @@ private
   end
 
   def get_htable name
-    @htable_pool.get_table name
+    (@htable_pool || @connection).get_table name
   end
 
   def check_closed

data/lib/hbase-jruby/pom/pom.xml.erb

@@ -10,7 +10,46 @@
   <name>hbase-jruby</name>
 
   <profiles>
-    <% %w[cdh4.5 cdh4.4 cdh4.3].each do |cdh| %>
+    <% %w[cdh5.0].each do |cdh| %>
+    <profile>
+      <id><%= cdh %></id>
+      <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <hadoop.version>2.3.0-<%= profiles[cdh] %></hadoop.version>
+        <hbase.version>0.96.1.1-<%= profiles[cdh] %></hbase.version>
+      </properties>
+      <repositories>
+        <repository>
+          <id>cloudera-releases</id>
+          <url>https://repository.cloudera.com/artifactory/cloudera-repos</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-common</artifactId>
+          <version>${hadoop.version}</version>
+          <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-client</artifactId>
+          <version>${hbase.version}</version>
+          <scope>compile</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+    <% end %>
+
+    <% %w[cdh4.6 cdh4.5 cdh4.4 cdh4.3].each do |cdh| %>
     <profile>
       <!-- http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH-Version-and-Packaging-Information/cdhvd_topic_8.html -->
       <id><%= cdh %></id>

data/lib/hbase-jruby/version.rb

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

data/test/test_aggregation.rb

@@ -5,8 +5,7 @@ require 'helper'
 
 class TestAggregation < TestHBaseJRubyBase
   def test_aggregation
-    # AggregationClient is removed in 0.96
-    return unless @aggregation
+    omit "AggregationClient is removed in 0.96" unless @aggregation
 
     (1..100).each do |idx|
       @table.put idx, 'cf1:a' => idx, 'cf1:b' => idx * 2

data/test/test_hbase.rb

@@ -86,15 +86,22 @@ class TestHBase < TestHBaseJRubyBase
     # Thread-local htable cache has now been created
     assert Thread.current[:hbase_jruby][hbase2][TABLE]
 
+    sleeping = {}
+    mutex = Mutex.new
     threads = 4.times.map { |i|
       Thread.new {
-        ht = hbase2[TABLE].htable
+        Thread.current[:htable] = hbase2[TABLE].htable
+        mutex.synchronize { sleeping[Thread.current] = true }
         sleep
       }
     }
+    sleep 0.1 while mutex.synchronize { sleeping.length } < 4
     threads.each do |t|
-      t.kill
+      assert t[:htable]
       assert t[:hbase_jruby][hbase2][TABLE]
+      assert_equal t[:htable], t[:hbase_jruby][hbase2][TABLE]
+
+      t.kill
     end
 
     # Now close the connection
@@ -113,20 +120,23 @@ class TestHBase < TestHBaseJRubyBase
 
   def test_reset_pool
     hbase2 = HBase.new @hbase.config
-    table  = hbase2[TABLE]
+    omit_unless(hbase2.use_table_pool?) do
+      table  = hbase2[TABLE]
 
-    htable = table.htable
-    assert_equal htable, table.htable
-    assert_equal htable, hbase2[TABLE.to_sym].htable
+      htable = table.htable
+      assert_equal htable, table.htable
+      assert_equal htable, hbase2[TABLE.to_sym].htable
 
-    assert_nil hbase2.reset_table_pool
+      assert_nil hbase2.reset_table_pool
 
-    assert_not_equal htable, table.htable
-    assert_not_equal htable, hbase2[TABLE].htable
+      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
+      htable = table.htable
+      assert_equal htable, table.htable
+      assert_equal htable, hbase2[TABLE.to_sym].htable
+    end
+    hbase2.close
   end
 end
 

data/test/test_table_admin.rb

@@ -143,7 +143,7 @@ class TestTableAdmin < TestHBaseJRubyBase
   end
 
   def test_add_coprocessor!
-    return unless @aggregation
+    omit "AggregationClient is removed in 0.96" unless @aggregation
 
     coproc = 'org.apache.hadoop.hbase.coprocessor.AggregateImplementation'
     assert_false @table.has_coprocessor? coproc

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hbase-jruby
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: java
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-05-26 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.1
+rubygems_version: 2.2.2
 signing_key:
 specification_version: 4
 summary: A JRuby binding for HBase