HBASE-2274 Hbase Shell hcd() method is broken by the replication scope parameter (Alexey Kovyrin via Lars George)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@917162 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Lars George 2010-02-28 10:47:07 +00:00
parent 0a047240c6
commit ffac8a385c
2 changed files with 6 additions and 3 deletions

View File

@ -216,6 +216,8 @@ Release 0.21.0 - Unreleased
HBASE-2259 StackOverflow in ExplicitColumnTracker when row has many columns
HBASE-2268 [stargate] Failed tests and DEBUG output is dumped to console
since move to Mavenized build
HBASE-2274 Hbase Shell hcd() method is broken by the replication scope
parameter (Alexey Kovyrin via Lars George)
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable

View File

@ -44,6 +44,7 @@ module HBase
METHOD = "METHOD"
MAXLENGTH = "MAXLENGTH"
CACHE_BLOCKS = "CACHE_BLOCKS"
REPLICATION_SCOPE = "REPLICATION_SCOPE"
# Wrapper for org.apache.hadoop.hbase.client.HBaseAdmin
class Admin
@ -315,8 +316,7 @@ module HBase
# public HColumnDescriptor(final byte [] familyName, final int maxVersions,
# final String compression, final boolean inMemory,
# final boolean blockCacheEnabled, final int blocksize,
# final int maxValueLength,
# final int timeToLive, final boolean bloomFilter) {
# final int timeToLive, final boolean bloomFilter, final int scope) {
name = arg[NAME]
raise ArgumentError.new("Column family " + arg + " must have a name") \
unless name
@ -329,7 +329,8 @@ module HBase
arg[HColumnDescriptor::BLOCKCACHE]? JBoolean.valueOf(arg[HColumnDescriptor::BLOCKCACHE]): HColumnDescriptor::DEFAULT_BLOCKCACHE,
arg[HColumnDescriptor::BLOCKSIZE]? JInteger.valueOf(arg[HColumnDescriptor::BLOCKSIZE]): HColumnDescriptor::DEFAULT_BLOCKSIZE,
arg[HColumnDescriptor::TTL]? JInteger.new(arg[HColumnDescriptor::TTL]): HColumnDescriptor::DEFAULT_TTL,
arg[HColumnDescriptor::BLOOMFILTER]? JBoolean.valueOf(arg[HColumnDescriptor::BLOOMFILTER]): HColumnDescriptor::DEFAULT_BLOOMFILTER)
arg[HColumnDescriptor::BLOOMFILTER]? JBoolean.valueOf(arg[HColumnDescriptor::BLOOMFILTER]): HColumnDescriptor::DEFAULT_BLOOMFILTER,
arg[HColumnDescriptor::REPLICATION_SCOPE]? JInteger.new(arg[REPLICATION_SCOPE]): HColumnDescriptor::DEFAULT_REPLICATION_SCOPE)
end
def zk(args)