hbase-jruby 0.1.5-java → 0.1.6-java

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.1.6
+-----
+- Maven dependencies for 0.94 and 0.92
+- Progress reporting for synchronous table administration
+- Added asynchronous versions of table administration methods
+
 0.1.5
 -----
 - Added support for shorter integers

data/README.md

@@ -17,7 +17,7 @@ Anyhow, JRuby is Ruby, not Java, right?
 ```ruby
 require 'hbase-jruby'
 
-HBase.resolve_dependency! 'cdh4.1.2'
+HBase.resolve_dependency! 'cdh4.1'
 
 hbase = HBase.new
 table = hbase.table(:test_table)
@@ -47,7 +47,16 @@ table.delete(:rowkey9)
 
 ## Installation
 
-    $ gem install hbase-jruby
+### From Rubygems
+
+    gem install hbase-jruby
+
+### From source
+
+    git clone -b devel https://github.com/junegunn/hbase-jruby.git
+    cd hbase-jruby
+    rake build
+    gem install pkg/hbase-jruby-0.1.6-java.gem
 
 ## Setting up
 
@@ -62,18 +71,19 @@ which automatically resolves Hadoop/HBase dependency.
 #### Preconfigured dependencies
 
 Apache Maven is the de facto standard dependency management mechanism for Java projects.
-Current version of *hbase-jruby* is shipped with Maven dependency specifications
+Current version of *hbase-jruby* is shipped with
+[Maven dependency specifications](https://github.com/junegunn/hbase-jruby/blob/master/lib/hbase-jruby/pom/pom.xml)
 for the following Hadoop/HBase distributions.
 
-* [cdh4.1.2](https://github.com/junegunn/hbase-jruby/blob/master/lib/hbase-jruby/pom/cdh4.1.2.xml)
-    * Recommended as of now
-* [cdh3u5](https://github.com/junegunn/hbase-jruby/blob/master/lib/hbase-jruby/pom/cdh3u5.xml)
-    * Does not support some features
+* cdh4.1
+* cdh3
+* 0.94
+* 0.92
 
 ```ruby
 require 'hbase-jruby'
 
-HBase.resolve_dependency! 'cdh4.1.2'
+HBase.resolve_dependency! 'cdh4.1'
 ```
 
 (If you're behind an http proxy, set up your ~/.m2/settings.xml file
@@ -693,7 +703,7 @@ ba.unshift 200, true
 ba << { short: 300 }
 ```
 
-concatenate another ByteArray, 
+concatenate another ByteArray,
 
 ```ruby
 ba += HBase::ByteArray(1024)
@@ -718,7 +728,10 @@ ba.java  # Returns the native Java byte array (byte[])
 
 ### Table administration
 
-`HBase#Table` provides a few *synchronous* table administration methods.
+`HBase#Table` provides a few synchronous (`HTable#method_name!`) and
+asynchronous (`HTable#method_name`) table administration methods.
+Synchronous *bang* methods for table alteration take an optional block and pass the progress of the operation to it
+as a pair of parameters, the number of regions processed and total number of regions to process.
 
 ```ruby
 # Create a table with configurable table-level properties
@@ -730,14 +743,25 @@ table.create!(
     :max_filesize       => 256 * 1024 ** 2,
     :deferred_log_flush => false)
 
-# Alter table properties
-table.alter!(
+# Alter table properties (asynchronous)
+table.alter(
   :max_filesize       => 512 * 1024 ** 2,
   :memstore_flushsize =>  64 * 1024 ** 2,
   :readonly           => false,
   :deferred_log_flush => true
 )
 
+# Alter table properties (synchronous)
+table.alter!(
+  :max_filesize       => 512 * 1024 ** 2,
+  :memstore_flushsize =>  64 * 1024 ** 2,
+  :readonly           => false,
+  :deferred_log_flush => true
+) { |progress, total|
+  # Progress report with an optional block
+  puts [progress, total].join('/')
+}
+
 # Add column family
 table.add_family! :cf3, :compression => :snappy,
                         :bloomfilter => :row
@@ -782,6 +806,7 @@ end
 ```bash
 # Bash script
 export HBASE_JRUBY_TEST_ZK='your-hbaase.domain.net'
+export HBASE_JRUBY_TEST_DIST='0.94'
 
 # Test both for 1.8 and 1.9
 for v in --1.8 --1.9; do

data/lib/hbase-jruby/admin.rb

@@ -1,26 +1,28 @@
-require 'thread'
-
 class HBase
 # @private
 module Admin
 private
   def with_admin
-    (@admin_mutex ||= Mutex.new).synchronize do
-      begin
-        admin = HBaseAdmin.new(@config)
-        yield admin
-      ensure
-        admin.close if admin
-      end
+    begin
+      admin = HBaseAdmin.new(@config)
+      yield admin
+    ensure
+      admin.close if admin
     end
   end
 
-  def wait_async_admin admin
+  def wait_async_admin admin, &block
+    prev_yet = nil
     while true
       pair  = admin.getAlterStatus(@name.to_java_bytes)
       yet   = pair.getFirst
       total = pair.getSecond
 
+      if block && yet != prev_yet
+        block.call (total - yet), total
+        prev_yet = yet
+      end
+
       break if yet == 0
       sleep 1
     end

data/lib/hbase-jruby/dependency.rb

@@ -23,36 +23,22 @@ class HBase
           mvn = `which mvn`
           raise RuntimeError, "Cannot find executable `mvn`" if mvn.empty?
 
-          distname = dist.downcase.sub(/\.xml$/, '')
-          path = [
-            File.expand_path("../pom/#{distname}.xml", __FILE__),
-            dist.to_s,
-          ].select { |f| File.exists? f }.first
-
-          # Try github head
-          unless path
-            begin
-              xml = open("https://raw.github.com/junegunn/hbase-jruby/master/lib/hbase-jruby/pom/#{distname}.xml").read
-              tempfiles << tf = Tempfile.new("#{distname}.xml")
-              tf.close(false)
-              path = tf.path
-              File.open(path, 'w') do |f|
-                f << xml
-              end
-            rescue OpenURI::HTTPError => e
-              # No such distribution anywhere. Leave path to be nil.
-            end
+          if File.exists?(dist)
+            path = dist
+          else
+            path = File.expand_path("../pom/pom.xml", __FILE__)
+            profile = "-P #{dist}"
           end
 
-          raise ArgumentError, "Invalid distribution: #{dist}" unless path
-
           # Download dependent JAR files and build classpath string
           tempfiles << tf = Tempfile.new('hbase-jruby-classpath')
           tf.close(false)
-          system "mvn org.apache.maven.plugins:maven-dependency-plugin:2.5.1:resolve org.apache.maven.plugins:maven-dependency-plugin:2.5.1:build-classpath -Dsilent=true -Dmdep.outputFile=#{tf.path} -f #{path} #{silencer}"
+          system "mvn org.apache.maven.plugins:maven-dependency-plugin:2.5.1:resolve org.apache.maven.plugins:maven-dependency-plugin:2.5.1:build-classpath -Dsilent=true -Dmdep.outputFile=#{tf.path} #{profile} -f #{path} #{silencer}"
 
           raise RuntimeError.new("Error occurred. Set verbose parameter to see the log.") unless $?.exitstatus == 0
 
+          output = File.read(tf.path)
+          raise ArgumentError.new("Invalid profile: #{dist}") if output.empty?
           File.read(tf.path).split(':')
         end
 

data/lib/hbase-jruby/hbase.rb

@@ -11,6 +11,11 @@ class HBase
   # Connects to HBase
   # @param [Hash] config A key-value pairs to build HBaseConfiguration from
   def initialize config = {}
+    unless defined?(Java::OrgApacheHadoopConf::Configuration)
+      raise NameError.new(
+        "Required Java classes not loaded. Set up CLASSPATH or try `HBase.resolve_dependency!`")
+    end
+
     HBase.import_java_classes!
 
     @config =

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

@@ -0,0 +1,201 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>hbase-jruby</groupId>
+  <artifactId>hbase-project</artifactId>
+  <version>0.1.6</version>
+  <packaging>jar</packaging>
+
+  <name>hbase-jruby</name>
+
+  <profiles>
+    <profile>
+      <id>cdh4.1</id>
+      <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <hadoop.version>2.0.0-cdh4.1.2</hadoop.version>
+        <hbase.version>0.92.1-cdh4.1.2</hbase.version>
+      </properties>
+      <repositories>
+        <repository>
+          <id>cloudera-releases</id>
+          <url>https://repository.cloudera.com/artifactory/cloudera-repos</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-common</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>cdh3</id>
+      <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <hbase.version>0.90.6-cdh3u5</hbase.version>
+        <hadoop.version>0.20.2-cdh3u5</hadoop.version>
+      </properties>
+
+      <repositories>
+        <repository>
+          <id>cloudera-releases</id>
+          <url>https://repository.cloudera.com/artifactory/cloudera-repos</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase</artifactId>
+          <version>${hbase.version}</version>
+          <scope>compile</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>0.92</id>
+      <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <hadoop.version>1.1.1</hadoop.version>
+        <hbase.version>0.92.2</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>0.94.3</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>
+
+    <!-- For backward compatibility -->
+    <profile>
+      <id>cdh4.1.2</id>
+      <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <hadoop.version>2.0.0-cdh4.1.2</hadoop.version>
+        <hbase.version>0.92.1-cdh4.1.2</hbase.version>
+      </properties>
+      <repositories>
+        <repository>
+          <id>cloudera-releases</id>
+          <url>https://repository.cloudera.com/artifactory/cloudera-repos</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-common</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>cdh3u5</id>
+      <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <hbase.version>0.90.6-cdh3u5</hbase.version>
+        <hadoop.version>0.20.2-cdh3u5</hadoop.version>
+      </properties>
+
+      <repositories>
+        <repository>
+          <id>cloudera-releases</id>
+          <url>https://repository.cloudera.com/artifactory/cloudera-repos</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase</artifactId>
+          <version>${hbase.version}</version>
+          <scope>compile</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+</project>
+

data/lib/hbase-jruby/scoped/aggregation.rb

@@ -4,11 +4,18 @@ class Scoped
 # @author Junegunn Choi <junegunn.c@gmail.com>
 module Aggregation
   module Admin
-    # Enables aggregation support for the table
+    # Enables aggregation support for the table (asynchronous)
     # @return [nil]
-    def enable_aggregation!
+    def enable_aggregation
       cpc = 'org.apache.hadoop.hbase.coprocessor.AggregateImplementation'
-      add_coprocessor! cpc unless has_coprocessor?(cpc)
+      add_coprocessor cpc unless has_coprocessor?(cpc)
+    end
+
+    # Enables aggregation support for the table (synchronous)
+    # @return [nil]
+    def enable_aggregation! &block
+      cpc = 'org.apache.hadoop.hbase.coprocessor.AggregateImplementation'
+      add_coprocessor! cpc, &block unless has_coprocessor?(cpc)
     end
   end
 

data/lib/hbase-jruby/table.rb

@@ -106,7 +106,7 @@ class Table
     todo.call if todo # Avoids mutex relocking
   end
 
-  # Alters the table
+  # Alters the table (synchronous)
   # @param [Hash] props Table properties
   # @return [nil]
   # @example
@@ -116,53 +116,55 @@ class Table
   #     :readonly           => false,
   #     :deferred_log_flush => true
   #   )
-  def alter! props
-    with_admin do |admin|
-      htd = admin.get_table_descriptor(@name.to_java_bytes)
-      patch_table_descriptor! htd, props
-      while_disabled(admin) do
-        admin.modifyTable @name.to_java_bytes, htd
-        wait_async_admin(admin)
-      end
-    end
+  def alter! props, &block
+    _alter props, true, &block
   end
 
-  # Adds the column family
+  # Alters the table (asynchronous)
+  # @see HBase::Table#alter!
+  def alter props
+    _alter props, false
+  end
+
+  # Adds the column family (synchronous)
   # @param [#to_s] name The name of the column family
   # @param [Hash] opts Column family properties
   # @return [nil]
-  def add_family! name, opts
-    with_admin do |admin|
-      while_disabled(admin) do
-        admin.addColumn @name, hcd(name.to_s, opts)
-        wait_async_admin(admin)
-      end
-    end
+  def add_family! name, opts, &block
+    _add_family name, opts, true, &block
+  end
+
+  # Adds the column family (asynchronous)
+  # @see HBase::Table#add_family!
+  def add_family name, opts
+    _add_family name, opts, false
   end
 
   # Alters the column family
   # @param [#to_s] name The name of the column family
   # @param [Hash] opts Column family properties
   # @return [nil]
-  def alter_family! name, opts
-    with_admin do |admin|
-      while_disabled(admin) do
-        admin.modifyColumn @name, hcd(name.to_s, opts)
-        wait_async_admin(admin)
-      end
-    end
+  def alter_family! name, opts, &block
+    _alter_family name, opts, true, &block
+  end
+
+  # Alters the column family (asynchronous)
+  # @see HBase::Table#alter_family!
+  def alter_family name, opts
+    _alter_family name, opts, false
   end
 
   # Removes the column family
   # @param [#to_s] name The name of the column family
   # @return [nil]
-  def delete_family! name
-    with_admin do |admin|
-      while_disabled(admin) do
-        admin.deleteColumn @name, name.to_s
-        wait_async_admin(admin)
-      end
-    end
+  def delete_family! name, &block
+    _delete_family name, true, &block
+  end
+
+  # Removes the column family (asynchronous)
+  # @see HBase::Table#delete_family!
+  def delete_family name
+    _delete_family name, false
   end
 
   # Adds the table coprocessor to the table
@@ -171,39 +173,26 @@ class Table
   # @option props [String] path The path of the JAR file
   # @option props [Fixnum] priority Coprocessor priority
   # @option props [Hash<#to_s, #to_s>] params Arbitrary key-value parameter pairs passed into the coprocessor
-  def add_coprocessor! class_name, props = {}
-    with_admin do |admin|
-      while_disabled(admin) do
+  def add_coprocessor! class_name, props = {}, &block
+    _add_coprocessor class_name, props, true, &block
+  end
 
-        htd = admin.get_table_descriptor(@name.to_java_bytes)
-        if props.empty?
-          htd.addCoprocessor class_name
-        else
-          path, priority, params = props.values_at :path, :priority, :params
-          params = Hash[ params.map { |k, v| [k.to_s, v.to_s] } ]
-          htd.addCoprocessor class_name, path, priority || Coprocessor::PRIORITY_USER, params
-        end
-        admin.modifyTable @name.to_java_bytes, htd
-        wait_async_admin(admin)
-      end
-    end
+  # Adds the table coprocessor to the table (asynchronous)
+  def add_coprocessor class_name, props = {}
+    _add_coprocessor class_name, props, false
   end
 
   # Removes the coprocessor from the table.
   # @param [String] class_name Full class name of the coprocessor
   # @return [nil]
-  def remove_coprocessor! name
-    unless org.apache.hadoop.hbase.HTableDescriptor.respond_to?(:removeCoprocessor)
-      raise NotImplementedError, "org.apache.hadoop.hbase.HTableDescriptor.removeCoprocessor not implemented"
-    end
-    with_admin do |admin|
-      while_disabled(admin) do
-        htd = admin.get_table_descriptor(@name.to_java_bytes)
-        htd.removeCoprocessor name
-        admin.modifyTable @name.to_java_bytes, htd
-        wait_async_admin(admin)
-      end
-    end
+  def remove_coprocessor! class_name, &block
+    _remove_coprocessor class_name, true, &block
+  end
+
+  # Removes the coprocessor from the table (asynchronous)
+  # @see HBase::Table#remove_coprocessor!
+  def remove_coprocessor class_name
+    _remove_coprocessor class_name, false
   end
 
   # Return if the table has the coprocessor of the given class name
@@ -498,6 +487,76 @@ private
     end
     htd
   end
+
+  def _alter props, bang, &block
+    with_admin do |admin|
+      htd = admin.get_table_descriptor(@name.to_java_bytes)
+      patch_table_descriptor! htd, props
+      while_disabled(admin) do
+        admin.modifyTable @name.to_java_bytes, htd
+        wait_async_admin(admin, &block) if bang
+      end
+    end
+  end
+
+  def _add_family name, opts, bang, &block
+    with_admin do |admin|
+      while_disabled(admin) do
+        admin.addColumn @name, hcd(name.to_s, opts)
+        wait_async_admin(admin, &block) if bang
+      end
+    end
+  end
+
+  def _alter_family name, opts, bang, &block
+    with_admin do |admin|
+      while_disabled(admin) do
+        admin.modifyColumn @name, hcd(name.to_s, opts)
+        wait_async_admin(admin, &block) if bang
+      end
+    end
+  end
+
+  def _delete_family name, bang, &block
+    with_admin do |admin|
+      while_disabled(admin) do
+        admin.deleteColumn @name, name.to_s
+        wait_async_admin(admin, &block) if bang
+      end
+    end
+  end
+
+  def _add_coprocessor class_name, props = {}, bang, &block
+    with_admin do |admin|
+      while_disabled(admin) do
+
+        htd = admin.get_table_descriptor(@name.to_java_bytes)
+        if props.empty?
+          htd.addCoprocessor class_name
+        else
+          path, priority, params = props.values_at :path, :priority, :params
+          params = Hash[ params.map { |k, v| [k.to_s, v.to_s] } ]
+          htd.addCoprocessor class_name, path, priority || Coprocessor::PRIORITY_USER, params
+        end
+        admin.modifyTable @name.to_java_bytes, htd
+        wait_async_admin(admin, &block) if bang
+      end
+    end
+  end
+
+  def _remove_coprocessor name, bang, &block
+    unless org.apache.hadoop.hbase.HTableDescriptor.respond_to?(:removeCoprocessor)
+      raise NotImplementedError, "org.apache.hadoop.hbase.HTableDescriptor.removeCoprocessor not implemented"
+    end
+    with_admin do |admin|
+      while_disabled(admin) do
+        htd = admin.get_table_descriptor(@name.to_java_bytes)
+        htd.removeCoprocessor name
+        admin.modifyTable @name.to_java_bytes, htd
+        wait_async_admin(admin, &block) if bang
+      end
+    end
+  end
 end#Table
 end#HBase
 

data/lib/hbase-jruby/version.rb

@@ -1,5 +1,5 @@
 class HBase
 module JRuby
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end
 end

data/test/helper.rb

@@ -11,7 +11,7 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require "hbase-jruby"
 
 # Required
-unless HBase.resolve_dependency!('cdh4.1.2').all? { |f| File.exists? f }
+unless HBase.resolve_dependency!(ENV.fetch 'HBASE_JRUBY_TEST_DIST').all? { |f| File.exists? f }
   puts "Invalid return value from HBase.resolve_dependency!"
   exit 1
 end

data/test/test_table_admin.rb

@@ -81,14 +81,20 @@ class TestTableAdmin < TestHBaseJRubyBase
 
     max_fs = 512 * 1024 ** 2
     mem_fs =  64 * 1024 ** 2
-    
+
+    progress = total = nil
     @table.alter!(
       :max_filesize       => max_fs,
       :memstore_flushsize => mem_fs,
       :readonly           => false,
       :deferred_log_flush => true
-    )
-    
+    ) do |p, t|
+      progress = p
+      total = t
+    end
+    assert_equal total, progress
+    assert progress > 0
+
     assert_equal max_fs, @table.descriptor.get_max_file_size
     assert_equal mem_fs, @table.descriptor.get_mem_store_flush_size
     assert_equal false,  @table.descriptor.is_read_only
@@ -140,7 +146,7 @@ class TestTableAdmin < TestHBaseJRubyBase
       :blockcache          => true,
       :blocksize           => 128 * 1024,
       :bloomfilter         => :row,
-      :compression         => :snappy,
+      :compression         => :gzip,
     # :data_block_encoding => org.apache.hadoop.hbase.io.encoding.DataBlockEncoding::DIFF,
     # :encode_on_disk      => true,
     # :keep_deleted_cells  => true,
@@ -157,7 +163,7 @@ class TestTableAdmin < TestHBaseJRubyBase
     assert_equal 'ROW', cf[:bloomfilter]
     assert_equal '0', cf[:replication_scope]
     assert_equal '10', cf[:versions]
-    assert_equal 'SNAPPY', cf[:compression]
+    assert_equal 'GZIP', cf[:compression]
     assert_equal '5', cf[:min_versions]
     assert_equal '100', cf[:ttl]
     assert_equal '131072', cf[:blocksize]
@@ -166,5 +172,5 @@ class TestTableAdmin < TestHBaseJRubyBase
 
     @table.drop!
   end
-end
+end unless ENV['HBASE_JRUBY_TEST_SKIP_ADMIN']
 

metadata

@@ -2,27 +2,27 @@
 name: hbase-jruby
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.1.5
+  version: 0.1.6
 platform: java
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-02 00:00:00.000000000 Z
+date: 2013-01-19 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==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: !binary |-
           MA==
@@ -33,14 +33,14 @@ dependencies:
   name: simplecov
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: !binary |-
           MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: !binary |-
           MA==
@@ -54,7 +54,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -68,8 +68,7 @@ files:
 - lib/hbase-jruby/column_key.rb
 - lib/hbase-jruby/dependency.rb
 - lib/hbase-jruby/hbase.rb
-- lib/hbase-jruby/pom/cdh3u5.xml
-- lib/hbase-jruby/pom/cdh4.1.2.xml
+- lib/hbase-jruby/pom/pom.xml
 - lib/hbase-jruby/result.rb
 - lib/hbase-jruby/scoped.rb
 - lib/hbase-jruby/scoped/aggregation.rb
@@ -95,14 +94,14 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: !binary |-
         MA==
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: !binary |-
         MA==

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

@@ -1,40 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.daumcorp.datatech.hbase.client</groupId>
-  <artifactId>hbase-project</artifactId>
-  <version>cdh3u5</version>
-  <packaging>jar</packaging>
-
-  <name>hbase-jruby</name>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <hbase.version>0.90.6-cdh3u5</hbase.version>
-    <hadoop.version>0.20.2-cdh3u5</hadoop.version>
-  </properties>
-
-  <repositories>
-    <repository>
-      <id>cloudera-releases</id>
-      <url>https://repository.cloudera.com/artifactory/cloudera-repos</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase</artifactId>
-      <version>${hbase.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
-

data/lib/hbase-jruby/pom/cdh4.1.2.xml

@@ -1,47 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.daumcorp.datatech.hbase.client</groupId>
-  <artifactId>hbase-project</artifactId>
-  <version>cdh4</version>
-  <packaging>jar</packaging>
-
-  <name>hbase-jruby</name>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <hadoop.version>2.0.0-cdh4.1.2</hadoop.version>
-    <hbase.version>0.92.1-cdh4.1.2</hbase.version>
-  </properties>
-
-  <repositories>
-    <repository>
-      <id>cloudera-releases</id>
-      <url>https://repository.cloudera.com/artifactory/cloudera-repos</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</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>
-</project>
-