hbase-jruby 0.4.1-java → 0.4.2-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fb5332ec468aee60e38e869db395bbae44796a7a
+  data.tar.gz: 8379861af0be920e67f705b6a1bafbcf96a18a02
+SHA512:
+  metadata.gz: 4c934c7adf252bd2fd4830ac63d6e6322ae565be624dce270c9faac060814db8087d39ac9522bf4db121002efae828e120828266d29fd9d53a77501890c2a0b2
+  data.tar.gz: 19b0b3208669c141bfeeff7f19ae2785b1b16c66c924d8b7da92588bfaff4c156b33f481e596b95355cdd49df92d3c9e3b9fa122b6f6effb81e049f8562785eb

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+0.4.2
+-----
+- Fixed bug when using schema with non-String/Symbol qualifier
+- Updated dependency profiles
+  - Added CDH4.5, CDH4.4 (same as CDH4.3)
+  - 0.95, 0.96 (experimental, currently not working)
+- Improved compatibility with HBase shell which is based on JRuby 1.6.5
+
 0.4.1
 -----
 - Fixed .META. scanning with range prefix ([#26](https://github.com/junegunn/hbase-jruby/issues/26))

data/README.md

@@ -150,12 +150,13 @@ Call `HBase.resolve_dependency!` helper method passing one of the arguments list
 
 | Argument   | Dependency               | Default version | Required executable |
 | ---------- | ------------------------ | --------------- | ------------------- |
-| cdh4.3[.*] | Cloudera CDH4.3          | cdh4.3.0        | mvn                 |
-| cdh4.2[.*] | Cloudera CDH4.2          | cdh4.2.1        | mvn                 |
-| cdh4.1[.*] | Cloudera CDH4.1          | cdh4.1.4        | 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.95[.*]   | Apache HBase 0.95        | 0.95.0          | mvn                 |
-| 0.94[.*]   | Apache HBase 0.94        | 0.94.9          | mvn                 |
+| 0.94[.*]   | Apache HBase 0.94        | 0.94.13         | mvn                 |
 | 0.92[.*]   | Apache HBase 0.92        | 0.92.2          | mvn                 |
 | *POM PATH* | Custom Maven POM file    | -               | mvn                 |
 | `:local`   | Local HBase installation | -               | hbase               |
@@ -1213,6 +1214,10 @@ ba.shift(:string, 11)  # Byte length must be given as Strings are not fixed in s
 ba.java  # Returns the native Java byte array (byte[])
 ```
 
+## API documentation
+
+[http://rubydoc.info/gems/hbase-jruby/0.4.1/frames](http://rubydoc.info/gems/hbase-jruby/0.4.1/frames)
+
 ## Test
 
 ```bash

data/lib/hbase-jruby/dependency.rb

@@ -12,19 +12,22 @@ class HBase
   # https://ccp.cloudera.com/display/SUPPORT/CDH+Downloads
   SUPPORTED_PROFILES = {
     # Prefix => Latest known version
-    'cdh4.3' => 'cdh4.3.0',
-    'cdh4.2' => 'cdh4.2.1',
-    'cdh4.1' => 'cdh4.1.4',
+    'cdh4.5' => 'cdh4.5.0',
+    'cdh4.4' => 'cdh4.4.0',
+    'cdh4.3' => 'cdh4.3.2',
+    'cdh4.2' => 'cdh4.2.2',
+    'cdh4.1' => 'cdh4.1.5',
     'cdh3'   => 'cdh3u6',
-    '0.95'   => '0.95.0',
-    '0.94'   => '0.94.9',
+    '0.96'   => '0.96.1.1-hadoop2',
+    '0.95'   => '0.95.2-hadoop2',
+    '0.94'   => '0.94.15',
     '0.92'   => '0.92.2',
   }
 
   class << self
     # @overload resolve_dependency!(dist, options)
     #   Resolve Hadoop and HBase dependency with a predefined Maven profile
-    #   @param [String] dist HBase distribution: cdh4.2, cdh4.1, cdh3, 0.94, 0.92, local
+    #   @param [String] dist HBase distribution: cdh4.[1-5], cdh3, 0.94, 0.92, local
     #   @param [Hash] options Options
     #   @option options [Boolean] :verbose Enable verbose output
     #   @return [Array<String>] Loaded JAR files
@@ -65,7 +68,7 @@ class HBase
           else
             matched_profiles = SUPPORTED_PROFILES.keys.select { |pf| dist.start_with? pf }
             if matched_profiles.length != 1
-              raise ArgumentError, "Invalid profile: #{dist}"
+              raise ArgumentError, "Unknown profile: #{dist}"
             end
             matched_profile = matched_profiles.first
             profiles = SUPPORTED_PROFILES.dup
@@ -81,9 +84,15 @@ class HBase
           # Download dependent JAR files and build classpath string
           tempfiles << tf = Tempfile.new('hbase-jruby-classpath')
           tf.close(false)
-          system "mvn org.apache.maven.plugins:maven-dependency-plugin:2.5.1:resolve org.apache.maven.plugins:maven-dependency-plugin:2.5.1:build-classpath -Dsilent=true -Dmdep.outputFile=#{tf.path} #{profile} -f #{path} #{silencer}"
-
-          raise RuntimeError.new("Error occurred. Set verbose option to see the log.") unless $?.exitstatus == 0
+          system("mvn org.apache.maven.plugins:maven-dependency-plugin:2.5.1:resolve " <<
+                 "org.apache.maven.plugins:maven-dependency-plugin:2.5.1:build-classpath " <<
+                 "-Dsilent=true -Dmdep.outputFile=#{tf.path} #{profile} -f #{path} #{silencer}")
+
+          unless $?.exitstatus == 0
+            message = "Error occurred."
+            message << " Set verbose option to see the log." unless verbose
+            raise RuntimeError.new(message)
+          end
 
           if File.read(tf.path).empty?
             desc =

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

@@ -10,13 +10,14 @@
   <name>hbase-jruby</name>
 
   <profiles>
+    <% %w[cdh4.5 cdh4.4 cdh4.3].each do |cdh| %>
     <profile>
-      <!-- http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-Installation-Guide/cdh4ig_topic_31.html -->
-      <id>cdh4.3</id>
+      <!-- http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH-Version-and-Packaging-Information/cdhvd_topic_8.html -->
+      <id><%= cdh %></id>
       <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <hadoop.version>2.0.0-<%= profiles['cdh4.3'] %></hadoop.version>
-        <hbase.version>0.94.6-<%= profiles['cdh4.3'] %></hbase.version>
+        <hadoop.version>2.0.0-<%= profiles[cdh] %></hadoop.version>
+        <hbase.version>0.94.6-<%= profiles[cdh] %></hbase.version>
       </properties>
       <repositories>
         <repository>
@@ -47,6 +48,7 @@
         </dependency>
       </dependencies>
     </profile>
+    <% end %>
 
     <profile>
       <id>cdh4.2</id>
@@ -129,7 +131,6 @@
         <hbase.version>0.90.6-<%= profiles['cdh3'] %></hbase.version>
         <hadoop.version>0.20.2-<%= profiles['cdh3'] %></hadoop.version>
       </properties>
-
       <repositories>
         <repository>
           <id>cloudera-releases</id>
@@ -153,7 +154,38 @@
       </dependencies>
     </profile>
 
-    <% %w[0.92 0.94 0.95].each do |version| %>
+    <% %w[0.95 0.96].each do |version| %>
+    <profile>
+      <id><%= version %></id>
+      <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <hbase.version><%= profiles[version] %></hbase.version>
+      </properties>
+
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <% if profiles[version] =~ /hadoop2/ %>
+          <artifactId>hadoop-common</artifactId>
+          <version>2.2.0</version>
+          <% else %>
+          <artifactId>hadoop-core</artifactId>
+          <version>1.1.2</version>
+          <% end %>
+          <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase</artifactId>
+          <version>${hbase.version}</version>
+          <scope>compile</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+    <% end %>
+
+    <% %w[0.92 0.94].each do |version| %>
     <profile>
       <id><%= version %></id>
       <properties>

data/lib/hbase-jruby/row.rb

@@ -43,9 +43,10 @@ class Row
   def to_h
     HASH_TEMPLATE.clone.tap do |ret|
       @result.getNoVersionMap.each do |cf, cqmap|
-        cf = cf.to_s
+        cf = Util.from_bytes :string, cf
         cqmap.each do |cq, val|
-          f, q, t = @table.lookup_schema(cq.to_s)
+          cqs = Util.from_bytes(:string, cq) rescue nil
+          f, q, t = @table.lookup_schema(cqs)
           t = nil if f != cf
           name = t ? q : [cf.to_sym, ByteArray[cq]]
 
@@ -60,9 +61,10 @@ class Row
   def to_H
     HASH_TEMPLATE.clone.tap do |ret|
       @result.getMap.each do |cf, cqmap|
-        cf = cf.to_s
+        cf = Util.from_bytes :string, cf
         cqmap.each do |cq, tsmap|
-          f, q, t = @table.lookup_schema(cq.to_s)
+          cqs = Util.from_bytes(:string, cq) rescue nil
+          f, q, t = @table.lookup_schema(cqs)
           t = nil if f != cf
           name = t ? q : [cf.to_sym, ByteArray[cq]]
 

data/lib/hbase-jruby/schema.rb

@@ -77,10 +77,16 @@ class Schema
   def lookup table, col
     return nil unless lookup = @lookup[table]
 
-    if match = lookup[:exact][col]
-      return match
-    elsif pair = lookup[:pattern].find { |k, v| col.to_s =~ k }
-      return pair[1].dup.tap { |e| e[1] = col.to_sym }
+    case col
+    when String, Symbol
+      if match = lookup[:exact][col]
+        return match
+      elsif pair = lookup[:pattern].find { |k, v| col.to_s =~ k }
+        colsym = col.to_sym rescue nil
+        return colsym && pair[1].dup.tap { |e| e[1] = colsym }
+      end
+    else
+      return nil
     end
   end
 

data/lib/hbase-jruby/version.rb

@@ -1,5 +1,5 @@
 class HBase
 module JRuby
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end
 end

data/test/test_schema.rb

@@ -410,5 +410,19 @@ class TestSchema < TestHBaseJRubyBase
     assert_equal true, HBase::Util.java_bytes?(@table.get(rk)['cf1:a'])
     assert_equal 100,  HBase::Util.from_bytes(:fixnum, @table.get(rk)['cf1:a'])
   end
+
+  def test_schema_bytearray
+    # Does not support non-string/symbol qualifiers
+    @hbase.schema[@table.name] = {
+      :cf1 => {
+        /.*/ => :fixnum
+      }
+    }
+
+    rk = next_rowkey
+    @table.put rk, [:cf1, HBase::ByteArray[1234]] => 1234
+
+    assert_equal HBase::ByteArray[1234], HBase::ByteArray[@table.get(rk)[[:cf1, HBase::ByteArray[1234]]]]
+  end
 end
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hbase-jruby
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.4.1
+  version: 0.4.2
 platform: java
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -18,13 +17,11 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -34,13 +31,11 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
   type: :development
 description: A JRuby binding for HBase
@@ -90,6 +85,7 @@ files:
 homepage: https://github.com/junegunn/hbase-jruby
 licenses:
 - MIT
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -99,18 +95,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: A JRuby binding for HBase
 test_files:
 - test/helper.rb