hbase-jruby 0.7.0-java → 0.7.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0714705c9427de687d1657774b34d8126ef10dbd
-  data.tar.gz: 768ac4c28e4709151a665290402f2a3fe573aefb
+  metadata.gz: a11f20dabc1a006d84c0d657e878a706f3c04e11
+  data.tar.gz: 80d648377fbc94157cf5c8addcfcabc15a06c30d
 SHA512:
-  metadata.gz: 2102cbfca64c12be4addf08d0c6526549fe7f25923c079b89510d0a3404d1e64245d9feac24299c9ae10ff8533f2e8aaedf08d4859af5158fcea815a34e7ba14
-  data.tar.gz: dfb7325181769b6e57319c072d874f2b01dce456edaad2c7d33590eda98963b9b05a5540d7856b0df85253a900d39fe4829d047bde990ca18346b810a6d92858
+  metadata.gz: 3b586cf5138693aac0b2e34025d413a65d91d22053e7d3b3ae3d6cc2a2121df1080e445b72f11ad6d3b2ad23e6c4642e1dbaefeb31f0e749e9251b599aa6e5aa
+  data.tar.gz: 70476d6fcda145a3d5b703748cabc72da20ebe82fe49149858e32c7513affa8621733f9eb5d723ec686935565d9bafadf6a45f2a7489cedfc634113dbf085aec

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.7.1
+-----
+
+- Support setting one timestamp for all columns (#41)
+
 0.7.0
 -----
 

data/README.md

@@ -53,7 +53,7 @@ hbase = HBase.new 'localhost'
 # Table object
 table = hbase[:test_table]
 table.drop! if table.exists?
-table.create! :cf1, :cf2
+table.create! :cf1 => {}, :cf2 => {}
 
 # PUT
 table.put 'rowkey1' => { 'cf1:a' => 100, 'cf2:b' => 'Hello' },
@@ -326,16 +326,25 @@ table.put 'rowkey1', title: "Hello World", year: 2013
 
 # Putting multiple rows
 table.put 'rowkey1' => { title: 'foo',    year: 2013 },
-          'rowkey2' => { title: "bar",    year: 2014 },
+          'rowkey2' => { title: 'bar',    year: 2014 },
           'rowkey3' => { title: 'foobar', year: 2015 }
 
 # Putting values with timestamps
 table.put 'rowkey1',
   title: {
-    1353143856665 => "Hello world",
-    1352978648642 => "Goodbye world"
+    1353143856665 => 'Hello world',
+    1352978648642 => 'Goodbye world'
   },
   year: 2013
+
+# Putting values with the same timestamp
+table.put('rowkey1',
+  {
+    title: 'foo',
+    year: 2016
+  },
+  1463678960135
+)
 ```
 
 ### GET
@@ -1254,17 +1263,10 @@ ba.java  # Returns the native Java byte array (byte[])
 ## Test
 
 ```bash
-#!/bin/bash
-
-# Test HBase 0.94 on localhost
-export HBASE_JRUBY_TEST_ZK='127.0.0.1'
-export HBASE_JRUBY_TEST_DIST='0.94'
-
-# Test both for 1.8 and 1.9
-for v in --1.8 --1.9; do
-  export JRUBY_OPTS=$v
-  rake test
-done
+export CLASSPATH=hbase-client-dep-1.2.jar
+export HBASE_JRUBY_TEST_ZK=localhost
+export JRUBY_OPTS=--debug
+jrake test TESTOPTS=-v
 ```
 
 ## Contributing

data/hbase-jruby.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'simplecov'
 end

data/lib/hbase-jruby/table.rb

@@ -73,7 +73,7 @@ class Table
       puts = args.first.map { |rowkey, props| @mutation.put rowkey, props }
       htable.put puts
       puts.length
-    when 2
+    when 2, 3
       htable.put @mutation.put(*args)
       1
     else

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

@@ -8,7 +8,7 @@ class Mutation
     @table = table
   end
 
-  def put rowkey, props
+  def put rowkey, props, timestamp = nil
     Put.new(Util.to_bytes rowkey).tap { |put|
       props.each do |col, val|
         next if val.nil?
@@ -28,9 +28,17 @@ class Mutation
             end unless v.nil?
           end
         when String
-          put.add cf, cq, val.to_java_bytes
+          if timestamp
+            put.add cf, cq, time_to_long(timestamp), val.to_java_bytes
+          else
+            put.add cf, cq, val.to_java_bytes
+          end
         else
-          put.add cf, cq, Util.to_typed_bytes(type, val)
+          if timestamp
+            put.add cf, cq, time_to_long(timestamp), Util.to_typed_bytes(type, val)
+          else
+            put.add cf, cq, Util.to_typed_bytes(type, val)
+          end
         end
       end
       raise ArgumentError, "no column to put" if put.empty?

data/lib/hbase-jruby/version.rb

@@ -1,5 +1,5 @@
 class HBase
 module JRuby
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end
 end

data/test/helper.rb

@@ -1,9 +1,8 @@
 $VERBOSE = true
 
-require 'minitest/autorun'
 require 'simplecov'
 SimpleCov.start
-
+require 'minitest/autorun'
 RECREATE = false
 
 unless defined? Enumerator
@@ -21,7 +20,7 @@ HBase.log4j = { 'log4j.threshold' => 'ERROR' }
 
 class TestHBaseJRubyBase < Minitest::Test
   TABLE = 'test_hbase_jruby'
-  ZK    = ENV.fetch 'HBASE_JRUBY_TEST_ZK'
+  ZK    = ENV.fetch('HBASE_JRUBY_TEST_ZK', 'localhost')
 
   # Initialize
   hbase = HBase.new 'hbase.zookeeper.quorum' => ZK

data/test/test_hbase.rb

@@ -4,17 +4,6 @@ $LOAD_PATH.unshift File.expand_path('..', __FILE__)
 require 'helper'
 
 class TestHBase < TestHBaseJRubyBase
-  def test_log4j
-    HBase.log4j = File.expand_path('../log4j/log4j.properties', __FILE__)
-    HBase.log4j = File.expand_path('../log4j/log4j.xml', __FILE__)
-
-    begin
-      HBase.log4j = File.expand_path('../log4j/log4j_invalid.xml', __FILE__)
-      assert false, "Exception must be thrown when invalid XML is given"
-    rescue Exception
-    end
-  end
-
   def test_tables
     assert @hbase.table_names.include?(TABLE)
     assert @hbase.list.include?(TABLE)

data/test/test_table.rb

@@ -147,8 +147,9 @@ class TestTable < TestHBaseJRubyBase
     assert_equal 'A1', @table.get(rowkey).string('cf1:pdp')
   end
 
-  def test_put_timestamp
+  def test_put_timestamp_per_column
     rowkey = next_rowkey
+
     @table.put rowkey => {
       'cf1:b' => 'B1',
       'cf1:a' => {
@@ -164,6 +165,21 @@ class TestTable < TestHBaseJRubyBase
     assert_equal ['B1'],                @table.versions(:all).get(rowkey).strings('cf1:b').values
   end
 
+  def test_put_timestamp_for_all_columns
+    rowkey = next_rowkey
+
+    # Fixnum timestamp support.
+    @table.put(rowkey, { 'cf1:a' => 'A4' }, 1280000000000)
+
+    assert_equal 'A4', @table.versions(:all).get(rowkey).strings('cf1:a')[1280000000000]
+
+    # Ruby Time timestamp support.
+    @table.put(rowkey, { 'cf1:a' => 'A5', 'cf1:b' => 777 }, Time.at(1290000000))
+
+    assert_equal 'A5', @table.versions(:all).get(rowkey).strings('cf1:a')[1290000000000]
+    assert_equal 777, @table.versions(:all).get(rowkey).fixnums('cf1:b')[1290000000000]
+  end
+
   def test_increment
     row1 = next_rowkey.to_s
     row2 = next_rowkey.to_s

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: hbase-jruby
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: java
 authors:
 - Junegunn Choi
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2016-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: simplecov
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A JRuby binding for HBase
 email:
 - junegunn.c@gmail.com
@@ -86,7 +100,7 @@ homepage: https://github.com/junegunn/hbase-jruby
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -101,9 +115,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.5.1
+signing_key: 
 specification_version: 4
 summary: A JRuby binding for HBase
 test_files:
@@ -117,4 +131,3 @@ test_files:
 - test/test_table.rb
 - test/test_table_admin.rb
 - test/test_util.rb
-has_rdoc: