hbase-jruby 0.2.3-java → 0.2.4-java

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.2.4
+-----
+- Fixed NameError when HBase::ByteArray is used without first creating an HBase instance
+- Updated dependency profiles: 0.95.0, 0.94.6.1, 0.92.2, cdh3u6
+
 0.2.3
 -----
 - Fix: [Thread.current[:htable] must be local to each connection](https://github.com/junegunn/hbase-jruby/issues/4)

data/README.md

@@ -66,15 +66,19 @@ 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               | 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                 |
-| 0.92[.*]   | Apache HBase 0.92        | mvn                 |
-| *POM PATH* | Custom Maven POM file    | mvn                 |
-| `:local`   | Local HBase installation | hbase               |
+| Argument   | Dependency               | Default version | Required executable |
+| ---------- | ------------------------ | --------------- | ------------------- |
+| cdh4.2[.*] | Cloudera CDH4.2          | cdh4.2.0        | mvn                 |
+| cdh4.1[.*] | Cloudera CDH4.1          | cdh4.1.3        | 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.6.1        | 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.0`)
 
 #### Examples
 
@@ -84,7 +88,7 @@ HBase.resolve_dependency! 'cdh4.2.0'
 HBase.resolve_dependency! 'cdh4.1.3'
 
 # Load JAR files of HBase 0.94.x using Maven
-HBase.resolve_dependency! '0.94.1'
+HBase.resolve_dependency! '0.94.6.1'
 HBase.resolve_dependency! '0.94.2', :verbose => true
 
 # Dependency resolution with custom POM file
@@ -92,6 +96,7 @@ HBase.resolve_dependency! '/path/to/my/pom.xml'
 HBase.resolve_dependency! '/path/to/my/pom.xml', :profile => 'trunk'
 
 # Load JAR files from local HBase installation
+# (equivalent to: export CLASSPATH=$CLASSPATH:`hbase classpath`)
 HBase.resolve_dependency! :local
 ```
 

data/lib/hbase-jruby/byte_array.rb

@@ -20,9 +20,13 @@ class ByteArray
   # each converted to its byte array representation
   # @param [*Object] values
   def initialize *values
-    @java = values.inject(Util::JAVA_BYTE_ARRAY_EMPTY) { |sum, value|
-      Bytes.add sum, Util.to_bytes(value)
-    }
+    HBase.import_java_classes!
+    if defined?(Bytes) && defined?(Arrays)
+      ByteArray.class_eval do
+        alias initialize initialize_
+      end
+    end
+    initialize_(*values)
   end
 
   def each
@@ -111,7 +115,7 @@ class ByteArray
         length
       end
     raise ArgumentError.new("Byte length must be specified for type: #{type}") unless length
-    raise ArgumentError.new("Not enought bytes for #{type}") if length > @java.length
+    raise ArgumentError.new("Not enough bytes for #{type}") if length > @java.length
 
     arr   = @java.to_a
     val   = arr[0, length].to_java(Java::byte)
@@ -142,6 +146,13 @@ class ByteArray
   def hash
     Arrays.java_send(:hashCode, [Util::JAVA_BYTE_ARRAY_CLASS], @java)
   end
+
+private
+  def initialize_ *values
+    @java = values.inject(Util::JAVA_BYTE_ARRAY_EMPTY) { |sum, value|
+      Bytes.add sum, Util.to_bytes(value)
+    }
+  end
 end#ByteArray
 end#HBase
 

data/lib/hbase-jruby/dependency.rb

@@ -7,13 +7,17 @@ require 'erb'
 class HBase
 
   # @private
+  # https://github.com/apache/hbase/tags
+  # http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.apache.hbase%22%20AND%20a%3A%22hbase%22
+  # https://ccp.cloudera.com/display/SUPPORT/CDH+Downloads
   SUPPORTED_PROFILES = {
-    # Prefix => Latest version
+    # Prefix => Latest known version
     'cdh4.2' => 'cdh4.2.0',
     'cdh4.1' => 'cdh4.1.3',
-    'cdh3'   => 'cdh3u5',
-    '0.94'   => '0.94.3',
-    '0.92'   => '0.92.1',
+    'cdh3'   => 'cdh3u6',
+    '0.95'   => '0.95.0',
+    '0.94'   => '0.94.6.1',
+    '0.92'   => '0.92.2',
   }
 
   class << self
@@ -111,7 +115,7 @@ class HBase
     end
 
     # Import Java classes (Prerequisite for classes in hbase-jruby)
-    # @return [Array<String>] List of Java classes not found
+    # @return [Array<String>] List of Java classes *NOT* found
     def import_java_classes!
       imp = lambda { |hash|
         hash.map { |base, classes|

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

@@ -4,7 +4,7 @@
 
   <groupId>hbase-jruby</groupId>
   <artifactId>hbase-project</artifactId>
-  <version>0.2.3</version>
+  <version>0.2.4</version>
   <packaging>jar</packaging>
 
   <name>hbase-jruby</name>
@@ -115,37 +115,13 @@
       </dependencies>
     </profile>
 
+    <% %w[0.92 0.94 0.95].each do |version| %>
     <profile>
-      <id>0.92</id>
+      <id><%= version %></id>
       <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <hadoop.version>1.1.1</hadoop.version>
-        <hbase.version><%= profiles['0.92'] %></hbase.version>
-      </properties>
-
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-core</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>0.94</id>
-      <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <hadoop.version>1.1.1</hadoop.version>
-        <hbase.version><%= profiles['0.94'] %></hbase.version>
+        <hadoop.version>1.1.2</hadoop.version>
+        <hbase.version><%= profiles[version] %></hbase.version>
       </properties>
 
       <dependencies>
@@ -164,6 +140,7 @@
         </dependency>
       </dependencies>
     </profile>
+    <% end %>
   </profiles>
 </project>
 

data/lib/hbase-jruby/scoped.rb

@@ -389,7 +389,7 @@ private
       # Timerange / Timestamp
       case @trange
       when Array
-        get.setTimeRange *@trange
+        get.setTimeRange(*@trange)
       when Time, Fixnum
         get.setTimeStamp @trange
       end
@@ -520,7 +520,7 @@ private
       # Timerange / Timestamp
       case @trange
       when Array
-        scan.setTimeRange *@trange
+        scan.setTimeRange(*@trange)
       when Time, Fixnum
         scan.setTimeStamp @trange
       end

data/lib/hbase-jruby/table/admin.rb

@@ -65,7 +65,7 @@ class Table
       case desc
       when HTableDescriptor
         patch_table_descriptor! desc, props
-        admin.createTable *[desc, splits].compact
+        admin.createTable(*[desc, splits].compact)
       when Symbol, String
         todo = lambda { create!({desc => {}}, props) }
       when Hash
@@ -75,7 +75,7 @@ class Table
           htd.addFamily hcd(name, opts)
         end
 
-        admin.createTable *[htd, splits].compact
+        admin.createTable(*[htd, splits].compact)
       else
         raise ArgumentError, 'Invalid table description'
       end

data/lib/hbase-jruby/util.rb

@@ -14,6 +14,8 @@ module Util
     # @param [byte[]] v
     # @return [byte[]]
     def to_bytes v
+      import_java_classes!
+
       case v
       when Array
         v.to_java(Java::byte)
@@ -70,6 +72,7 @@ module Util
     def from_bytes type, val
       return nil if val.nil?
 
+      import_java_classes!
       case type
       when :string, :str
         Bytes.to_string val
@@ -124,6 +127,17 @@ module Util
         return cf, cq
       end
     end
+
+  private
+    def import_java_classes!
+      HBase.import_java_classes!
+      if defined?(ByteBuffer) && defined?(KeyValue) && defined?(Bytes)
+        self.instance_eval do
+          def import_java_classes!
+          end
+        end
+      end
+    end
   end
 
 private

data/lib/hbase-jruby/version.rb

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

metadata

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