hbase-jruby 0.5.0-java → 0.5.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38719a45c5f33a6b3ea5841b32325eec7e709ebf
-  data.tar.gz: cc3634b8218d60809d86256819eb8b6657dcad63
+  metadata.gz: c04d7e2d6f49d78fb778390c8711ce7bf627f15f
+  data.tar.gz: 604381ab596d50cea5cea4f75367922dbe885ed1
 SHA512:
-  metadata.gz: 11aebd9b28bce00bb7130197c9b9b55d59311cecd38d1711fef0703d62833db234a3e224d365df153c63c1fd9d1b638df57185dc988412d6c91c1596b1c476ae
-  data.tar.gz: a375d7bc7e45c61c8c3f2613feacd05e83714b7992dd061f8c13ece2c8587e7f6590b9e18d02252e6aa8c979ae9fb9fdc439f035487feb7e6fb7b66004c8fe1e
+  metadata.gz: 93afab3c71ca6c297854e053b636d37a19f46af3be8c31ff78dc034dab53b664d60342db70875bce1161765eff60f0f00e920c86c11e3614fc65b97f01edb9c9
+  data.tar.gz: 70bc34ecaa532528a0ca26a31a123ec66e517c74875d43e6d007c56aa6c7a0573eb511bf0abd0ae3907f93ba07c0656085c33365cb42ef0b1b0a12c7244a623c

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+0.5.1
+-----
+- Fixed `Table#aggregate` for HBase 0.98 or above
+
 0.5.0
 -----
 - Added CDH5.0 (HBase 0.96.1.1) and CDH4.6 dependency profiles

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

@@ -47,10 +47,15 @@ private
   def aggregation_impl method, type
     raise ArgumentError.new("No column specified") if method != :row_count && @project.empty?
 
+    @@with_byte_array_name ||=
+      org.apache.hadoop.hbase.client.coprocessor.AggregationClient.
+      java_class.java_instance_methods.select { |m| m.name == 'sum' }.
+      map { |m| m.argument_types.first }.include?(''.to_java_bytes.java_class)
+
     @aggregation_client ||= AggregationClient.new(table.config)
     @aggregation_client.send(
       method,
-      Util.to_bytes(table.name),
+      @@with_byte_array_name ? Util.to_bytes(table.name) : htable,
       column_interpreter_for(type),
       filtered_scan)
   end

data/lib/hbase-jruby/version.rb

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

data/test/helper.rb

@@ -40,7 +40,12 @@ class TestHBaseJRubyBase < Test::Unit::TestCase
   def setup
     @hbase = connect
     @table = @hbase.table(TABLE)
-    @aggregation = defined?(org.apache.hadoop.hbase.client.coprocessor.AggregationClient)
+    begin
+      org.apache.hadoop.hbase.client.coprocessor.AggregationClient
+      @aggregation = true
+    rescue NameError
+      @aggregation = false
+    end
 
     # Drop & Create
     @table.drop! if RECREATE && @table.exists?

data/test/test_aggregation.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hbase-jruby
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: java
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit