hbase-jruby 0.3.0-java → 0.3.1-java

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.3.1
+-----
+- Fixed a bug in `'cf:cq' => :type` shortcut schema definition
+- Added schema data type validation
+- Fixed reference to ambiguous column names
+
 0.3.0
 -----
 - Easier data access with table schema

data/lib/hbase-jruby/row.rb

@@ -37,9 +37,12 @@ class Row
   def to_h
     HASH_TEMPLATE.clone.tap do |ret|
       @result.getNoVersionMap.each do |cf, cqmap|
+        cf = cf.to_s
         cqmap.each do |cq, val|
           f, q, t = @table.lookup_schema(cq.to_s)
-          name = t ? q : [cf.to_s.to_sym, ByteArray[cq]]
+          t = nil if f != cf
+          name = t ? q : [cf.to_sym, ByteArray[cq]]
+
           ret[name] = Util.from_bytes(t, val)
         end
       end
@@ -51,9 +54,11 @@ class Row
   def to_H
     HASH_TEMPLATE.clone.tap do |ret|
       @result.getMap.each do |cf, cqmap|
+        cf = cf.to_s
         cqmap.each do |cq, tsmap|
           f, q, t = @table.lookup_schema(cq.to_s)
-          name = t ? q : [cf.to_s.to_sym, ByteArray[cq]]
+          t = nil if f != cf
+          name = t ? q : [cf.to_sym, ByteArray[cq]]
 
           ret[name] =
             Hash[

data/lib/hbase-jruby/schema.rb

@@ -1,4 +1,5 @@
 require 'forwardable'
+require 'set'
 
 class HBase
 class Schema
@@ -35,7 +36,7 @@ class Schema
       # CF:CQ => Type shortcut
       cf = cf.to_s
       if cf.index(':')
-        cf, q = key.to_s.split ':', 2
+        cf, q = cf.to_s.split ':', 2
         cols = { q => cols }
       else
         raise ArgumentError, "invalid schema: expected Hash" unless cols.is_a?(Hash)
@@ -43,7 +44,10 @@ class Schema
 
       # Family => { Column => Type }
       cols.each do |cq, type|
-        raise ArgumentError, "invalid schema" unless type.is_a?(Symbol)
+        type = type.to_sym
+        unless KNOWN_TYPES.include? type
+          raise ArgumentError, "invalid schema: unknown type: #{type}"
+        end
 
         # Pattern
         case cq
@@ -110,6 +114,17 @@ private
     }
   end
 
+  KNOWN_TYPES = Set[
+    :string, :str, :symbol, :sym,
+    :byte,
+    :boolean, :bool,
+    :int,
+    :short,
+    :long, :fixnum,
+    :float, :double,
+    :bigdecimal,
+    :raw
+  ]
 end
 end
 

data/lib/hbase-jruby/version.rb

@@ -1,5 +1,5 @@
 class HBase
 module JRuby
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end
 end

data/test/test_schema.rb

@@ -12,6 +12,14 @@ class TestSchema < TestHBaseJRubyBase
     @hbase.schema.delete @table.name
   end
 
+  def test_invalid_schema_type
+    @hbase.schema = { @table.name => { :cf1 => { :a => 'string' } } }
+
+    assert_raise(ArgumentError) do
+      @hbase.schema = { @table.name => { :cf1 => { :a => :xxx } } }
+    end
+  end
+
   def test_schema
     @hbase.schema = {
       @table.name => {
@@ -27,6 +35,7 @@ class TestSchema < TestHBaseJRubyBase
 
         # cf3:f is a 8-byte integer
         :cf3 => { :f => :fixnum },
+        'cf3:g' => :float
       }
     }
 
@@ -98,6 +107,19 @@ class TestSchema < TestHBaseJRubyBase
     assert_equal 2, @table.filter(      'a' => 50..110).count
     assert_equal 2, @table.filter(       :a => 50..110).count
     assert_equal 1, @table.filter(:a => { :gt => 150 }).count
+
+    # cf:g (automatic type conversion)
+    @table.put   3,    :g => 3.14
+    assert_equal 3.14, @table.get(3)[:g]
+    @table.put   3,    :g => 314
+    assert_equal 314,  @table.get(3)[:g]
+
+    # cf3:g vs. cf2:g
+    @table.put   4,    :g => 3.14, 'cf2:g' => 'String'
+    assert_equal 3.14,     @table.get(4)[:g]
+    assert_equal 'String', @table.get(4)['cf2:g'].to_s
+    assert_equal 3.14,     @table.get(4).to_h[:g]
+    assert_equal 'String', @table.get(4).to_h['cf2:g'].to_s
   end
 
   def test_schema_readme

metadata

@@ -2,30 +2,28 @@
 name: hbase-jruby
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.3.0
+  version: 0.3.1
 platform: java
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :development
@@ -33,17 +31,15 @@ dependencies:
   name: simplecov
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :development
@@ -54,7 +50,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -96,17 +92,15 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 requirements: []
 rubyforge_project: