hbase-jruby 0.2.6-java → 0.3.0-java

data/test/test_util.rb

@@ -54,21 +54,21 @@ class TestUtil < Test::Unit::TestCase
   end
 
   def test_parse_column_name
-    assert_equal ['abc', 'def'],  parse_to_str('abc:def')
+    assert_equal ['abc', 'def' ], parse_to_str('abc:def')
     assert_equal ['abc', 'def:'], parse_to_str('abc:def:')
-    assert_equal ['abc', ''],     parse_to_str('abc:')
-    assert_equal ['abc', nil],    parse_to_str('abc')
-    assert_equal ['abc', ':::'],  parse_to_str('abc::::')
+    assert_equal ['abc', ''    ], parse_to_str('abc:')
+    assert_equal ['abc', nil   ], parse_to_str('abc')
+    assert_equal ['abc', ':::' ], parse_to_str('abc::::')
 
-    assert_equal [:abc, :def],   parse_to_str([:abc, :def], :symbol)
-    assert_equal [123, 456],     parse_to_str([123, 456], :fixnum)
+    assert_equal [:abc,  :def ], parse_to_str([:abc, :def], :symbol)
+    assert_equal [123,   456  ], parse_to_str([123, 456], :fixnum)
     assert_equal ['abc', 'def'], parse_to_str(
                                    org.apache.hadoop.hbase.KeyValue.new(
                                      'rowkey'.to_java_bytes,
                                      'abc'.to_java_bytes,
                                      'def'.to_java_bytes))
 
-    assert_equal [:abc, :def],   parse_to_str(HBase::ColumnKey.new(:abc, :def), :symbol)
+    assert_equal [:abc, :def],   parse_to_str([:abc, :def], :symbol)
 
     assert_raise(ArgumentError) { Util.parse_column_name(nil) }
     assert_raise(ArgumentError) { Util.parse_column_name('') }

metadata

@@ -2,14 +2,14 @@
 name: hbase-jruby
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.2.6
+  version: 0.3.0
 platform: java
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -65,11 +65,11 @@ files:
 - lib/hbase-jruby/admin.rb
 - lib/hbase-jruby/byte_array.rb
 - lib/hbase-jruby/cell.rb
-- lib/hbase-jruby/column_key.rb
 - lib/hbase-jruby/dependency.rb
 - lib/hbase-jruby/hbase.rb
 - lib/hbase-jruby/pom/pom.xml.erb
 - lib/hbase-jruby/row.rb
+- lib/hbase-jruby/schema.rb
 - lib/hbase-jruby/scoped.rb
 - lib/hbase-jruby/scoped/aggregation.rb
 - lib/hbase-jruby/table.rb
@@ -81,8 +81,8 @@ files:
 - test/test_aggregation.rb
 - test/test_byte_array.rb
 - test/test_cell.rb
-- test/test_column_key.rb
 - test/test_hbase.rb
+- test/test_schema.rb
 - test/test_scoped.rb
 - test/test_table.rb
 - test/test_table_admin.rb
@@ -119,8 +119,8 @@ test_files:
 - test/test_aggregation.rb
 - test/test_byte_array.rb
 - test/test_cell.rb
-- test/test_column_key.rb
 - test/test_hbase.rb
+- test/test_schema.rb
 - test/test_scoped.rb
 - test/test_table.rb
 - test/test_table_admin.rb

data/lib/hbase-jruby/column_key.rb

@@ -1,72 +0,0 @@
-class HBase
-class << self
-  # Shortcut method to HBase::ColumnKey.new
-  # @param [Object] cf Column family
-  # @param [Object] cq Column qualifier
-  def ColumnKey cf, cq
-    ColumnKey.new cf, cq
-  end
-end
-# Boxed class for column keys
-# @!attribute [r] cf
-#   @return [String] The column family
-class ColumnKey
-  attr_reader :cf
-  alias family cf
-
-  # Creates a ColumnKey object
-  # @param [Object] cf Column family
-  # @param [Object] cq Column qualifier
-  def initialize cf, cq
-    @cf = String.from_java_bytes Util.to_bytes(cf)
-    @cq = Util.to_bytes(cq)
-  end
-
-  # Returns the column qualifer decoded as the given type
-  # @param [Symbol] type
-  def cq type = :string
-    Util.from_bytes type, @cq
-  end
-  alias qualifier cq
-
-  # Checks whether if the two ColumnKeys are equal
-  # @param [Object] other
-  def eql? other
-    other = other_as_ck(other)
-    @cf == other.cf && Arrays.equals(@cq, other.cq(:raw))
-  end
-  alias == eql?
-
-  # Compares two ColumnKeys
-  # @param [Object] other
-  def <=> other
-    other = other_as_ck(other)
-    d = @cf <=> other.cf
-    d != 0 ? d : Bytes.compareTo(@cq, other.cq(:raw))
-  end
-
-  # Returns a hash number for this ColumnKey
-  # @return [Fixnum]
-  def hash
-    [@cf, Arrays.java_send(:hashCode, [Util::JAVA_BYTE_ARRAY_CLASS], @cq)].hash
-  end
-
-  # Returns String representation of the column key (Qualifier decoded as a String)
-  # @return [String]
-  def to_s
-    [@cf, @cq.empty? ? nil : cq].compact.join(':')
-  end
-
-private
-  def other_as_ck other
-    case other
-    when ColumnKey
-      other
-    else
-      cf, cq = Util.parse_column_name(other)
-      ColumnKey.new(cf, cq)
-    end
-  end
-end#ColumnKey
-end#HBase
-

data/test/test_column_key.rb

@@ -1,49 +0,0 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH.unshift File.expand_path('..', __FILE__)
-require 'helper'
-
-class TestColumnKey < Test::Unit::TestCase
-  Util = HBase::Util
-
-  def test_types
-    ck = HBase::ColumnKey("hello", "world")
-    assert_equal "hello", ck.family
-    assert_equal "hello", ck.cf
-    assert_equal "world", ck.qualifier
-    assert_equal "world", ck.cq
-    assert_equal 'hello:world', ck.to_s
-
-    ck = HBase::ColumnKey("hello".to_java_bytes, 123)
-    assert_equal "hello", ck.family
-    assert_equal "hello", ck.cf
-    assert_equal 123, ck.qualifier(:fixnum)
-    assert_equal 123, ck.cq(:fixnum)
-
-    ck = HBase::ColumnKey(:hello, nil)
-    assert_equal "hello", ck.family
-    assert_equal "hello", ck.cf
-    assert_equal '', ck.qualifier(:string)
-    assert_equal '', ck.cq(:string)
-    assert_equal 'hello', ck.to_s
-  end
-
-  def test_eql
-    ck1 = HBase::ColumnKey(:hello, :world)
-    ck2 = HBase::ColumnKey("hello", "world")
-
-    assert_equal ck1, ck2
-    assert_equal ck1, "hello:world"
-  end
-
-  def test_order
-    assert_equal (1..100).to_a,
-      (1..100).to_a.reverse.map { |cq|
-        HBase::ColumnKey(:cf, cq)
-      }.sort.map { |ck| ck.cq :fixnum }
-  end
-
-  def test_as_hash_key
-    assert({ HBase::ColumnKey(:hello, :world) => true }[ ck2 = HBase::ColumnKey("hello", "world") ])
-  end
-end