hbase-jruby 0.2.6-java → 0.3.0-java

data/hbase-jruby.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.platform      = 'java'
   gem.license       = 'MIT'
 
-  gem.files         = `git ls-files`.split($/)
+  gem.files         = `git ls-files`.split($/).reject { |f| f =~ /^benchmark/ }
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]

data/lib/hbase-jruby/byte_array.rb

@@ -2,6 +2,7 @@ class HBase
 class << self
   # Shortcut method to HBase::ByteArray.new
   # @param [*Object] values
+  # @return [HBase::ByteArray]
   def ByteArray *values
     ByteArray.new(*values)
   end
@@ -16,6 +17,13 @@ class ByteArray
 
   include Enumerable
 
+  # Shortcut method to HBase::ByteArray.new
+  # @param [*Object] values
+  # @return [HBase::ByteArray]
+  def self.[] *values
+    ByteArray.new(*values)
+  end
+
   # Initializes ByteArray instance with the given objects,
   # each converted to its byte array representation
   # @param [*Object] values
@@ -30,16 +38,14 @@ class ByteArray
   end
 
   def each
-    if block_given?
-      @java.to_a.each { |byte| yield byte }
-    else
-      self
-    end
+    return enum_for(:each) unless block_given?
+    @java.to_a.each { |byte| yield byte }
   end
 
   # Checks if the two byte arrays are the same
   # @param [HBase::ByteArray] other
   def eql? other
+    other = other_as_byte_array other
     Arrays.equals(@java, other.java)
   end
   alias == eql?
@@ -47,6 +53,7 @@ class ByteArray
   # Compares two ByteArray objects
   # @param [HBase::ByteArray] other
   def <=> other
+    other = other_as_byte_array other
     Bytes.compareTo(@java, other.java)
   end
 
@@ -147,12 +154,25 @@ class ByteArray
     Arrays.java_send(:hashCode, [Util::JAVA_BYTE_ARRAY_CLASS], @java)
   end
 
+  def inspect
+    "HBase::ByteArray<#{@java.to_a.join ', '}>"
+  end
+
 private
   def initialize_ *values
     @java = values.inject(Util::JAVA_BYTE_ARRAY_EMPTY) { |sum, value|
       Bytes.add sum, Util.to_bytes(value)
     }
   end
+
+  def other_as_byte_array other
+    case other
+    when ByteArray
+      other
+    else
+      ByteArray[other]
+    end
+  end
 end#ByteArray
 end#HBase
 

data/lib/hbase-jruby/cell.rb

@@ -7,7 +7,8 @@ class Cell
 
   # Creates a boxed object for a KeyValue object
   # @param [org.apache.hadoop.hbase.KeyValue] key_value
-  def initialize key_value
+  def initialize table, key_value
+    @table = table
     @java = key_value
     @ck   = nil
   end
@@ -16,16 +17,10 @@ class Cell
   # @param [Symbol] type The type of the rowkey.
   #   Can be one of :string, :symbol, :fixnum, :float, :short, :int, :bigdecimal, :boolean and :raw.
   # @return [String, byte[]]
-  def rowkey type = :string
+  def rowkey type = :raw
     Util.from_bytes type, @java.getRow
   end
 
-  # Returns the ColumnKey object for the cell
-  # @return [ColumnKey]
-  def column_key
-    @ck ||= ColumnKey.new @java.getFamily, @java.getQualifier
-  end
-
   # Returns the name of the column family of the cell
   # @return [String]
   def family
@@ -49,12 +44,17 @@ class Cell
   end
   alias ts timestamp
 
+  # Returns the value of the cell. If the column in not defined in the schema, returns Java byte array.
+  def value
+    _, _, type = @table.lookup_schema(cq)
+    Util.from_bytes(type, raw)
+  end
+
   # Returns the value of the cell as a Java byte array
   # @return [byte[]]
-  def value
+  def raw
     @java.getValue
   end
-  alias raw value
 
   # Returns the column value as a String
   # @return [String]
@@ -122,6 +122,17 @@ class Cell
     KeyValue.COMPARATOR.compare(@java, other.java)
   end
 
+  # Checks if the cells are the same
+  # @param [HBase::Cell] other
+  def eql? other
+    (self <=> other) == 0
+  end
+  alias == eql?
+
+  def hash
+    @java.hasCode
+  end
+
   # Returns a printable version of this cell
   # @return [String]
   def inspect

data/lib/hbase-jruby/dependency.rb

@@ -16,7 +16,7 @@ class HBase
     'cdh4.1' => 'cdh4.1.4',
     'cdh3'   => 'cdh3u6',
     '0.95'   => '0.95.0',
-    '0.94'   => '0.94.6.1',
+    '0.94'   => '0.94.7',
     '0.92'   => '0.92.2',
   }
 
@@ -154,10 +154,6 @@ class HBase
         HBase::Result => %w[
           org.apache.hadoop.hbase.util.Bytes
         ],
-        HBase::ColumnKey => %w[
-          java.util.Arrays
-          org.apache.hadoop.hbase.util.Bytes
-        ],
         HBase::Table => %w[
           org.apache.hadoop.hbase.HColumnDescriptor
           org.apache.hadoop.hbase.HTableDescriptor

data/lib/hbase-jruby/hbase.rb

@@ -4,7 +4,7 @@ require 'java'
 # @!attribute [r] config
 #   @return [org.apache.hadoop.conf.Configuration]
 class HBase
-  attr_reader :config
+  attr_reader :config, :schema
 
   include Admin
 
@@ -61,6 +61,7 @@ class HBase
         end
       end
     @htable_pool = HTablePool.new @config, java.lang.Integer::MAX_VALUE
+    @schema = Schema.new
     @closed = false
   end
 
@@ -138,6 +139,20 @@ class HBase
     }
   end
 
+  # @param [Hash] hash
+  # @return [HBase::Schema]
+  def schema= hash
+    unless hash.is_a?(Hash)
+      raise ArgumentError, "invalid schema: Hash required"
+    end
+
+    schema = Schema.new
+    hash.each do |table, definition|
+      schema[table] = definition
+    end
+    @schema = schema
+  end
+
 private
   def check_closed
     raise RuntimeError, "Connection already closed" if closed?