Author: stack
Date: Mon Mar 14 15:45:11 2011
New Revision: 1081430
URL: http://svn.apache.org/viewvc?rev=1081430&view=rev
Log:
HBASE-3631 CLONE - HBase 2984 breaks ability to specify BLOOMFILTER &
COMPRESSION via shell
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/ruby/hbase/admin.rb
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1081430&r1=1081429&r2=1081430&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Mon Mar 14 15:45:11 2011
@@ -101,6 +101,8 @@ Release 0.91.0 - Unreleased
HBASE-3620 Make HBCK utility faster
HBASE-3533 Allow HBASE_LIBRARY_PATH env var to specify extra locations
of native lib
+ HBASE-3631 CLONE - HBase 2984 breaks ability to specify BLOOMFILTER &
+ COMPRESSION via shell
TASK
HBASE-3559 Move report of split to master OFF the heartbeat channel
Modified: hbase/trunk/src/main/ruby/hbase/admin.rb
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/ruby/hbase/admin.rb?rev=1081430&r1=1081429&r2=1081430&view=diff
==============================================================================
--- hbase/trunk/src/main/ruby/hbase/admin.rb (original)
+++ hbase/trunk/src/main/ruby/hbase/admin.rb Mon Mar 14 15:45:11 2011
@@ -359,7 +359,7 @@ module Hbase
family.setScope(JInteger.valueOf(arg[org.apache.hadoop.hbase.HColumnDescriptor::REPLICATION_SCOPE]))
if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::REPLICATION_SCOPE)
family.setInMemory(JBoolean.valueOf(arg[org.apache.hadoop.hbase.HColumnDescriptor::IN_MEMORY]))
if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::IN_MEMORY)
family.setTimeToLive(JInteger.valueOf(arg[org.apache.hadoop.hbase.HColumnDescriptor::TTL]))
if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::TTL)
-
family.setCompressionType(arg[org.apache.hadoop.hbase.HColumnDescriptor::COMPRESSION])
if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::COMPRESSION)
+
family.setCompressionType(org.apache.hadoop.hbase.io.hfile.Compression::Algorithm.valueOf(arg[org.apache.hadoop.hbase.HColumnDescriptor::COMPRESSION]))
if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::COMPRESSION)
family.setBlocksize(JInteger.valueOf(arg[org.apache.hadoop.hbase.HColumnDescriptor::BLOCKSIZE]))
if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::BLOCKSIZE)
family.setMaxVersions(JInteger.valueOf(arg[org.apache.hadoop.hbase.HColumnDescriptor::VERSIONS]))
if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::VERSIONS)
if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::BLOOMFILTER)