hbase-jruby 0.2.2-java → 0.2.3-java

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+0.2.3
+-----
+- Fix: [Thread.current[:htable] must be local to each connection](https://github.com/junegunn/hbase-jruby/issues/4)
+- Fix: [`HBase.log4j=` to support XML based configuration](https://github.com/junegunn/hbase-jruby/issues/5)
+- Automatically set versions to 1 when counting records
+- New dependency profile: `cdh4.2`
+
 0.2.2
 -----
 - Added `HBase::Table#delete_row` method

data/README.md

@@ -12,7 +12,7 @@
 ```ruby
 require 'hbase-jruby'
 
-HBase.resolve_dependency! 'cdh4.1.3'
+HBase.resolve_dependency! 'cdh4.2.0'
 
 hbase = HBase.new
 table = hbase[:test_table]
@@ -68,6 +68,7 @@ Call `HBase.resolve_dependency!` helper method passing one of the arguments list
 
 | Argument   | Dependency               | Required executable |
 |------------|--------------------------|---------------------|
+| cdh4.2[.*] | Cloudera CDH4.2          | mvn                 |
 | cdh4.1[.*] | Cloudera CDH4.1          | mvn                 |
 | cdh3[u*]   | Cloudera CDH3            | mvn                 |
 | 0.94[.*]   | Apache HBase 0.94        | mvn                 |
@@ -78,9 +79,9 @@ Call `HBase.resolve_dependency!` helper method passing one of the arguments list
 #### Examples
 
 ```ruby
-# Load JAR files from CDH4.1.x using Maven
+# Load JAR files from CDH4 using Maven
+HBase.resolve_dependency! 'cdh4.2.0'
 HBase.resolve_dependency! 'cdh4.1.3'
-HBase.resolve_dependency! 'cdh4.1.1'
 
 # Load JAR files of HBase 0.94.x using Maven
 HBase.resolve_dependency! '0.94.1'
@@ -102,8 +103,9 @@ as described in [this page](http://maven.apache.org/guides/mini/guide-proxies.ht
 You may want to suppress (or customize) log messages from HBase.
 
 ```ruby
-# With an external log4j.properties file
+# With an external log4j.properties or log4j.xml file
 HBase.log4j = '/your/log4j.properties'
+HBase.log4j = '/your/log4j.xml'
 
 # With a Hash
 HBase.log4j = { 'log4j.threshold' => 'ERROR' }

data/lib/hbase-jruby/dependency.rb

@@ -9,6 +9,7 @@ class HBase
   # @private
   SUPPORTED_PROFILES = {
     # Prefix => Latest version
+    'cdh4.2' => 'cdh4.2.0',
     'cdh4.1' => 'cdh4.1.3',
     'cdh3'   => 'cdh3u5',
     '0.94'   => '0.94.3',
@@ -18,7 +19,7 @@ class HBase
   class << self
     # @overload resolve_dependency!(dist, options)
     #   Resolve Hadoop and HBase dependency with a predefined Maven profile
-    #   @param [String] dist HBase distribution: cdh4.1, cdh3, 0.94, 0.92, local
+    #   @param [String] dist HBase distribution: cdh4.2, cdh4.1, cdh3, 0.94, 0.92, local
     #   @param [Hash] options Options
     #   @option options [Boolean] :verbose Enable verbose output
     #   @return [Array<String>] Loaded JAR files

data/lib/hbase-jruby/hbase.rb

@@ -10,7 +10,7 @@ class HBase
 
   # @overload HBase.log4j=(filename)
   #   Configure Log4j logging with the given file
-  #   @param [String] filename Path to log4j.properties file
+  #   @param [String] filename Path to log4j.properties or log4j.xml file
   #   @return [nil]
   # @overload HBase.log4j=(hash)
   #   Configure Log4j logging with the given Hash
@@ -26,10 +26,15 @@ class HBase
       arg.each do |k, v|
         props.setProperty k.to_s, v.to_s
       end
-      arg = props
+      org.apache.log4j.PropertyConfigurator.configure props
+    else
+      case File.extname(arg).downcase
+      when '.xml'
+        org.apache.log4j.xml.DOMConfigurator.configure arg
+      else
+        org.apache.log4j.PropertyConfigurator.configure arg
+      end
     end
-
-    org.apache.log4j.PropertyConfigurator.configure arg
   end
 
   # Connects to HBase
@@ -78,6 +83,9 @@ class HBase
     unless @closed
       @htable_pool.close
       HConnectionManager.deleteConnection(@config, true)
+      if Thread.current[:hbase_jruby]
+        Thread.current[:hbase_jruby].delete(self)
+      end
       @closed = true
     end
   end

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

@@ -4,12 +4,49 @@
 
   <groupId>hbase-jruby</groupId>
   <artifactId>hbase-project</artifactId>
-  <version>0.2</version>
+  <version>0.2.3</version>
   <packaging>jar</packaging>
 
   <name>hbase-jruby</name>
 
   <profiles>
+    <profile>
+      <id>cdh4.2</id>
+      <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <hadoop.version>2.0.0-<%= profiles['cdh4.2'] %></hadoop.version>
+        <hbase.version>0.94.2-<%= profiles['cdh4.2'] %></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</artifactId>
+          <version>${hbase.version}</version>
+          <scope>compile</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+
     <profile>
       <id>cdh4.1</id>
       <properties>

data/lib/hbase-jruby/scoped.rb

@@ -48,6 +48,8 @@ class Scoped
   #   @param [Array<Object>] *rowkeys Rowkeys
   #   @return [Array<HBase::Result>]
   def get rowkeys
+    check_closed
+
     case rowkeys
     when Array
       htable.get(rowkeys.map { |rk| getify rk }).map { |result|
@@ -63,6 +65,8 @@ class Scoped
   # @yield [row] Yields each row in the scope
   # @yieldparam [HBase::Result] row
   def each
+    check_closed
+
     if block_given?
       begin
         scanner = htable.getScanner(filtered_scan)
@@ -531,9 +535,12 @@ private
     }
   end
 
+  # Scanner for just counting records
+  # @private
   def filtered_scan_minimum
     filtered_scan.tap do |scan|
       scan.cache_blocks = false
+      scan.setMaxVersions 1
 
       # A filter that will only return the first KV from each row
       # A filter that will only return the key component of each KV
@@ -605,6 +612,10 @@ private
       [val]
     end
   end
+
+  def check_closed
+    raise RuntimeError, "HBase connection is already closed" if @table.closed?
+  end
 end#Scoped
 end#HBase
 

data/lib/hbase-jruby/scoped/aggregation.rb

@@ -24,6 +24,8 @@ module Aggregation
   # @param [Symbol, org.apache.hadoop.hbase.coprocessor.ColumnInterpreter] type
   #   Column type (only :fixnum is supported as of now) or ColumnInterpreter object used to decode the value
   def aggregate op, type = :fixnum
+    check_closed
+
     aggregation_impl op, type
   end
 

data/lib/hbase-jruby/table.rb

@@ -16,11 +16,13 @@ class Table
   include HBase::Util
 
   # (INTERNAL) Returns the underlying org.apache.hadoop.hbase.client.HTable object (local to current thread)
-  # @return [org.apache.hadoop.hbase.client.HTable]
+  # @return [org.apache.hadoop.hbase.client.PooledHTable]
   def htable
     check_closed
 
-    local_htables = Thread.current[:htable] ||= {}
+    # [:hbase_jruby][HBase connection][Table name]
+    local_vars = Thread.current[:hbase_jruby] ||= {}
+    local_htables = local_vars[@hbase] ||= {}
     local_htables[@name] ||= @pool.get_table(@name)
   end
 
@@ -30,6 +32,12 @@ class Table
     nil
   end
 
+  # Returns whether if the connection is closed
+  # @return [Boolean]
+  def closed?
+    @hbase.closed?
+  end
+
   [:get, :count, :aggregate,
    :range, :project, :filter, :while,
    :limit, :versions, :caching, :batch,
@@ -59,6 +67,8 @@ class Table
   #   @param [Hash<Hash>] data Data to put indexed by rowkeys
   #   @return [Fixnum] Number of puts succeeded
   def put *args
+    check_closed
+
     return put(args.first => args.last) if args.length == 2
 
     puts = args.first.map { |rowkey, props| putify rowkey, props }
@@ -106,6 +116,8 @@ class Table
   #       ['a002', 'cf1'],
   #       ['a003'])
   def delete *args
+    check_closed
+
     specs = args.first.is_a?(Array) ? args : [args]
 
     htable.delete specs.map { |spec|
@@ -131,6 +143,8 @@ 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
 
@@ -150,6 +164,8 @@ class Table
   #   @example
   #     table.increment('a000', 'cf1:col1' => 1, 'cf1:col2' => 2)
   def increment rowkey, *args
+    check_closed
+
     if args.first.is_a?(Hash)
       cols = args.first
       htable.increment Increment.new(Util.to_bytes rowkey).tap { |inc|

data/lib/hbase-jruby/version.rb

@@ -1,5 +1,5 @@
 class HBase
 module JRuby
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end
 end

data/test/helper.rb

@@ -24,8 +24,12 @@ class TestHBaseJRubyBase < Test::Unit::TestCase
   end
   hbase.close
 
+  def connect
+    HBase.new 'hbase.zookeeper.quorum' => ZK
+  end
+
   def setup
-    @hbase ||= HBase.new 'hbase.zookeeper.quorum' => ZK
+    @hbase = connect
     @table = @hbase.table(TABLE)
 
     # Drop & Create
@@ -47,5 +51,6 @@ class TestHBaseJRubyBase < Test::Unit::TestCase
     if RECREATE
       @table.drop! if @table && @table.exists?
     end
+    @hbase.close
   end
 end

data/test/test_hbase.rb

@@ -4,6 +4,17 @@ $LOAD_PATH.unshift File.expand_path('..', __FILE__)
 require 'helper'
 
 class TestHBase < TestHBaseJRubyBase
+  def test_log4j
+    HBase.log4j = File.expand_path('../log4j/log4j.properties', __FILE__)
+    HBase.log4j = File.expand_path('../log4j/log4j.xml', __FILE__)
+
+    begin
+      HBase.log4j = File.expand_path('../log4j/log4j_invalid.xml', __FILE__)
+      assert false, "Exception must be thrown when invalid XML is given"
+    rescue Exception
+    end
+  end
+
   def test_tables
     assert @hbase.table_names.include?(TABLE)
     assert @hbase.list.include?(TABLE)
@@ -15,13 +26,34 @@ class TestHBase < TestHBaseJRubyBase
     table.exists?
     assert @hbase.list.is_a?(Array)
 
+    assert_equal table.htable, Thread.current[:hbase_jruby][@hbase][TABLE]
+
     assert !@hbase.closed?
+    assert !table.closed?
     @hbase.close
     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! }
+    # ...
+
+    # get, delete, put, delete_row, increment, each
+    assert_raise(RuntimeError) { table.first }
+    assert_raise(RuntimeError) { table.get :key }
+    assert_raise(RuntimeError) { table.put :key => {'cf1:a' => 100} }
+    assert_raise(RuntimeError) { table.delete :key }
+    assert_raise(RuntimeError) { table.delete_row :key }
+    assert_raise(RuntimeError) { table.increment :key, 'cf1:a' => 1 }
+    assert_raise(RuntimeError) { table.project('cf1:a').aggregate(:row_count) }
+
+    # Reconnect and check
+    @hbase = connect
+    table = @hbase[TABLE]
+    assert_equal table.htable, Thread.current[:hbase_jruby][@hbase][TABLE]
   end
 
   def test_admin

metadata

@@ -2,14 +2,14 @@
 name: hbase-jruby
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.2.2
+  version: 0.2.3
 platform: java
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit