You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2017/03/10 00:53:43 UTC
[1/2] hbase git commit: HBASE-17736 Some options can't be configured
by the shell
Repository: hbase
Updated Branches:
refs/heads/branch-1 598dd9bb0 -> 1105e1260
refs/heads/master d4cbff58c -> 26928ff91
HBASE-17736 Some options can't be configured by the shell
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1105e126
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1105e126
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1105e126
Branch: refs/heads/branch-1
Commit: 1105e1260d41220924257edb7849399e4c797d53
Parents: 598dd9b
Author: CHIA-PING TSAI <ch...@gmail.com>
Authored: Thu Mar 9 10:04:49 2017 +0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Mar 9 16:53:31 2017 -0800
----------------------------------------------------------------------
hbase-shell/src/main/ruby/hbase/admin.rb | 17 ++++++++--
hbase-shell/src/test/ruby/hbase/admin_test.rb | 36 ++++++++++++++++++++--
2 files changed, 47 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1105e126/hbase-shell/src/main/ruby/hbase/admin.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb b/hbase-shell/src/main/ruby/hbase/admin.rb
index ea4b0a7..9925df3 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -810,7 +810,14 @@ module Hbase
family.setKeepDeletedCells(org.apache.hadoop.hbase.KeepDeletedCells.valueOf(arg.delete(org.apache.hadoop.hbase.HColumnDescriptor::KEEP_DELETED_CELLS).to_s.upcase)) if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::KEEP_DELETED_CELLS)
family.setCompressTags(JBoolean.valueOf(arg.delete(org.apache.hadoop.hbase.HColumnDescriptor::COMPRESS_TAGS))) if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::COMPRESS_TAGS)
family.setPrefetchBlocksOnOpen(JBoolean.valueOf(arg.delete(org.apache.hadoop.hbase.HColumnDescriptor::PREFETCH_BLOCKS_ON_OPEN))) if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::PREFETCH_BLOCKS_ON_OPEN)
- family.setValue(COMPRESSION_COMPACT, arg.delete(COMPRESSION_COMPACT)) if arg.include?(COMPRESSION_COMPACT)
+ if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::COMPRESSION_COMPACT)
+ compression = arg.delete(org.apache.hadoop.hbase.HColumnDescriptor::COMPRESSION_COMPACT).upcase
+ unless org.apache.hadoop.hbase.io.compress.Compression::Algorithm.constants.include?(compression)
+ raise(ArgumentError, "Compression #{compression} is not supported. Use one of " + org.apache.hadoop.hbase.io.compress.Compression::Algorithm.constants.join(" "))
+ else
+ family.setCompactionCompressionType(org.apache.hadoop.hbase.io.compress.Compression::Algorithm.valueOf(compression))
+ end
+ end
if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::BLOOMFILTER)
bloomtype = arg.delete(org.apache.hadoop.hbase.HColumnDescriptor::BLOOMFILTER).upcase
unless org.apache.hadoop.hbase.regionserver.BloomType.constants.include?(bloomtype)
@@ -1125,9 +1132,9 @@ module Hbase
htd.setOwnerString(arg.delete(OWNER)) if arg[OWNER]
htd.setMaxFileSize(JLong.valueOf(arg.delete(MAX_FILESIZE))) if arg[MAX_FILESIZE]
htd.setReadOnly(JBoolean.valueOf(arg.delete(READONLY))) if arg[READONLY]
- htd.setCompactionEnabled(JBoolean.valueOf(arg[COMPACTION_ENABLED])) if arg[COMPACTION_ENABLED]
+ htd.setCompactionEnabled(JBoolean.valueOf(arg.delete(COMPACTION_ENABLED))) if arg[COMPACTION_ENABLED]
htd.setNormalizationEnabled(
- JBoolean.valueOf(arg[NORMALIZATION_ENABLED])) if arg[NORMALIZATION_ENABLED]
+ JBoolean.valueOf(arg.delete(NORMALIZATION_ENABLED))) if arg[NORMALIZATION_ENABLED]
htd.setMemStoreFlushSize(JLong.valueOf(arg.delete(MEMSTORE_FLUSHSIZE))) if arg[MEMSTORE_FLUSHSIZE]
# DEFERRED_LOG_FLUSH is deprecated and was replaced by DURABILITY. To keep backward compatible, it still exists.
# However, it has to be set before DURABILITY so that DURABILITY could overwrite if both args are set
@@ -1139,6 +1146,10 @@ module Hbase
end
end
htd.setDurability(org.apache.hadoop.hbase.client.Durability.valueOf(arg.delete(DURABILITY))) if arg[DURABILITY]
+ htd.setPriority(JInteger.valueOf(arg.delete(org.apache.hadoop.hbase.HTableDescriptor::PRIORITY))) if arg[org.apache.hadoop.hbase.HTableDescriptor::PRIORITY]
+ htd.setFlushPolicyClassName(arg.delete(org.apache.hadoop.hbase.HTableDescriptor::FLUSH_POLICY)) if arg[org.apache.hadoop.hbase.HTableDescriptor::FLUSH_POLICY]
+ htd.setRegionMemstoreReplication(JBoolean.valueOf(arg.delete(org.apache.hadoop.hbase.HTableDescriptor::REGION_MEMSTORE_REPLICATION))) if arg[org.apache.hadoop.hbase.HTableDescriptor::REGION_MEMSTORE_REPLICATION]
+ htd.setRegionSplitPolicyClassName(arg.delete(org.apache.hadoop.hbase.HTableDescriptor::SPLIT_POLICY)) if arg[org.apache.hadoop.hbase.HTableDescriptor::SPLIT_POLICY]
htd.setRegionReplication(JInteger.valueOf(arg.delete(REGION_REPLICATION))) if arg[REGION_REPLICATION]
set_user_metadata(htd, arg.delete(METADATA)) if arg[METADATA]
set_descriptor_config(htd, arg.delete(CONFIGURATION)) if arg[CONFIGURATION]
http://git-wip-us.apache.org/repos/asf/hbase/blob/1105e126/hbase-shell/src/test/ruby/hbase/admin_test.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/test/ruby/hbase/admin_test.rb b/hbase-shell/src/test/ruby/hbase/admin_test.rb
index d4d78d5..e53c6be 100644
--- a/hbase-shell/src/test/ruby/hbase/admin_test.rb
+++ b/hbase-shell/src/test/ruby/hbase/admin_test.rb
@@ -188,15 +188,45 @@ module Hbase
admin.create(@create_test_name, { NAME => 'a'}, { NAME => 'b'})
assert_equal(['a:', 'b:'], table(@create_test_name).get_all_columns.sort)
end
-
+
+ define_test "create should be able to set column options" do
+ drop_test_table(@create_test_name)
+ admin.create(@create_test_name,
+ { NAME => 'a',
+ CACHE_BLOOMS_ON_WRITE => 'TRUE',
+ CACHE_DATA_IN_L1 => 'TRUE',
+ CACHE_INDEX_ON_WRITE => 'TRUE',
+ EVICT_BLOCKS_ON_CLOSE => 'TRUE',
+ COMPRESSION_COMPACT => 'GZ'})
+ assert_equal(['a:'], table(@create_test_name).get_all_columns.sort)
+ assert_match(/CACHE_BLOOMS_ON_WRITE/, admin.describe(@create_test_name))
+ assert_match(/CACHE_DATA_IN_L1/, admin.describe(@create_test_name))
+ assert_match(/CACHE_INDEX_ON_WRITE/, admin.describe(@create_test_name))
+ assert_match(/EVICT_BLOCKS_ON_CLOSE/, admin.describe(@create_test_name))
+ assert_match(/GZ/, admin.describe(@create_test_name))
+ end
+
define_test "create should be able to set table options" do
drop_test_table(@create_test_name)
- admin.create(@create_test_name, 'a', 'b', 'MAX_FILESIZE' => 12345678, OWNER => '987654321')
+ admin.create(@create_test_name, 'a', 'b', 'MAX_FILESIZE' => 12345678,
+ OWNER => '987654321',
+ PRIORITY => '77',
+ FLUSH_POLICY => 'org.apache.hadoop.hbase.regionserver.FlushAllLargeStoresPolicy',
+ REGION_MEMSTORE_REPLICATION => 'TRUE',
+ SPLIT_POLICY => 'org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy',
+ COMPACTION_ENABLED => 'false')
assert_equal(['a:', 'b:'], table(@create_test_name).get_all_columns.sort)
assert_match(/12345678/, admin.describe(@create_test_name))
assert_match(/987654321/, admin.describe(@create_test_name))
+ assert_match(/77/, admin.describe(@create_test_name))
+ assert_match(/COMPACTION_ENABLED/, admin.describe(@create_test_name))
+ assert_match(/REGION_MEMSTORE_REPLICATION/, admin.describe(@create_test_name))
+ assert_match(/org.apache.hadoop.hbase.regionserver.FlushAllLargeStoresPolicy/,
+ admin.describe(@create_test_name))
+ assert_match(/org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy/,
+ admin.describe(@create_test_name))
end
-
+
define_test "create should ignore table_att" do
drop_test_table(@create_test_name)
admin.create(@create_test_name, 'a', 'b', METHOD => 'table_att', OWNER => '987654321')
[2/2] hbase git commit: HBASE-17736 Some options can't be configured
by the shell
Posted by ap...@apache.org.
HBASE-17736 Some options can't be configured by the shell
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/26928ff9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/26928ff9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/26928ff9
Branch: refs/heads/master
Commit: 26928ff912643c19167646ec22823518be186f0d
Parents: d4cbff5
Author: CHIA-PING TSAI <ch...@gmail.com>
Authored: Thu Mar 9 10:01:57 2017 +0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Mar 9 16:53:34 2017 -0800
----------------------------------------------------------------------
hbase-shell/src/main/ruby/hbase/admin.rb | 17 +++++++++--
hbase-shell/src/test/ruby/hbase/admin_test.rb | 35 ++++++++++++++++++++--
2 files changed, 46 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/26928ff9/hbase-shell/src/main/ruby/hbase/admin.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb b/hbase-shell/src/main/ruby/hbase/admin.rb
index d72a4a7..6aaa130 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -849,7 +849,6 @@ module Hbase
family.setKeepDeletedCells(org.apache.hadoop.hbase.KeepDeletedCells.valueOf(arg.delete(org.apache.hadoop.hbase.HColumnDescriptor::KEEP_DELETED_CELLS).to_s.upcase)) if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::KEEP_DELETED_CELLS)
family.setCompressTags(JBoolean.valueOf(arg.delete(org.apache.hadoop.hbase.HColumnDescriptor::COMPRESS_TAGS))) if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::COMPRESS_TAGS)
family.setPrefetchBlocksOnOpen(JBoolean.valueOf(arg.delete(org.apache.hadoop.hbase.HColumnDescriptor::PREFETCH_BLOCKS_ON_OPEN))) if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::PREFETCH_BLOCKS_ON_OPEN)
- family.setValue(COMPRESSION_COMPACT, arg.delete(COMPRESSION_COMPACT)) if arg.include?(COMPRESSION_COMPACT)
family.setMobEnabled(JBoolean.valueOf(arg.delete(org.apache.hadoop.hbase.HColumnDescriptor::IS_MOB))) if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::IS_MOB)
family.setMobThreshold(JLong.valueOf(arg.delete(org.apache.hadoop.hbase.HColumnDescriptor::MOB_THRESHOLD))) if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::MOB_THRESHOLD)
if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::BLOOMFILTER)
@@ -878,6 +877,14 @@ module Hbase
algorithm))
end
end
+ if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::COMPRESSION_COMPACT)
+ compression = arg.delete(org.apache.hadoop.hbase.HColumnDescriptor::COMPRESSION_COMPACT).upcase
+ unless org.apache.hadoop.hbase.io.compress.Compression::Algorithm.constants.include?(compression)
+ raise(ArgumentError, "Compression #{compression} is not supported. Use one of " + org.apache.hadoop.hbase.io.compress.Compression::Algorithm.constants.join(" "))
+ else
+ family.setCompactionCompressionType(org.apache.hadoop.hbase.io.compress.Compression::Algorithm.valueOf(compression))
+ end
+ end
if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::STORAGE_POLICY)
storage_policy = arg.delete(org.apache.hadoop.hbase.HColumnDescriptor::STORAGE_POLICY).upcase
family.setStoragePolicy(storage_policy)
@@ -1190,9 +1197,9 @@ module Hbase
htd.setOwnerString(arg.delete(OWNER)) if arg[OWNER]
htd.setMaxFileSize(JLong.valueOf(arg.delete(MAX_FILESIZE))) if arg[MAX_FILESIZE]
htd.setReadOnly(JBoolean.valueOf(arg.delete(READONLY))) if arg[READONLY]
- htd.setCompactionEnabled(JBoolean.valueOf(arg[COMPACTION_ENABLED])) if arg[COMPACTION_ENABLED]
+ htd.setCompactionEnabled(JBoolean.valueOf(arg.delete(COMPACTION_ENABLED))) if arg[COMPACTION_ENABLED]
htd.setNormalizationEnabled(
- JBoolean.valueOf(arg[NORMALIZATION_ENABLED])) if arg[NORMALIZATION_ENABLED]
+ JBoolean.valueOf(arg.delete(NORMALIZATION_ENABLED))) if arg[NORMALIZATION_ENABLED]
htd.setMemStoreFlushSize(JLong.valueOf(arg.delete(MEMSTORE_FLUSHSIZE))) if arg[MEMSTORE_FLUSHSIZE]
# DEFERRED_LOG_FLUSH is deprecated and was replaced by DURABILITY. To keep backward compatible, it still exists.
# However, it has to be set before DURABILITY so that DURABILITY could overwrite if both args are set
@@ -1204,6 +1211,10 @@ module Hbase
end
end
htd.setDurability(org.apache.hadoop.hbase.client.Durability.valueOf(arg.delete(DURABILITY))) if arg[DURABILITY]
+ htd.setPriority(JInteger.valueOf(arg.delete(org.apache.hadoop.hbase.HTableDescriptor::PRIORITY))) if arg[org.apache.hadoop.hbase.HTableDescriptor::PRIORITY]
+ htd.setFlushPolicyClassName(arg.delete(org.apache.hadoop.hbase.HTableDescriptor::FLUSH_POLICY)) if arg[org.apache.hadoop.hbase.HTableDescriptor::FLUSH_POLICY]
+ htd.setRegionMemstoreReplication(JBoolean.valueOf(arg.delete(org.apache.hadoop.hbase.HTableDescriptor::REGION_MEMSTORE_REPLICATION))) if arg[org.apache.hadoop.hbase.HTableDescriptor::REGION_MEMSTORE_REPLICATION]
+ htd.setRegionSplitPolicyClassName(arg.delete(org.apache.hadoop.hbase.HTableDescriptor::SPLIT_POLICY)) if arg[org.apache.hadoop.hbase.HTableDescriptor::SPLIT_POLICY]
htd.setRegionReplication(JInteger.valueOf(arg.delete(REGION_REPLICATION))) if arg[REGION_REPLICATION]
set_user_metadata(htd, arg.delete(METADATA)) if arg[METADATA]
set_descriptor_config(htd, arg.delete(CONFIGURATION)) if arg[CONFIGURATION]
http://git-wip-us.apache.org/repos/asf/hbase/blob/26928ff9/hbase-shell/src/test/ruby/hbase/admin_test.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/test/ruby/hbase/admin_test.rb b/hbase-shell/src/test/ruby/hbase/admin_test.rb
index 930debf..de2891b 100644
--- a/hbase-shell/src/test/ruby/hbase/admin_test.rb
+++ b/hbase-shell/src/test/ruby/hbase/admin_test.rb
@@ -192,16 +192,45 @@ module Hbase
command(:create, @create_test_name, { NAME => 'a'}, { NAME => 'b'})
assert_equal(['a:', 'b:'], table(@create_test_name).get_all_columns.sort)
end
-
+
+ define_test "create should be able to set column options" do
+ drop_test_table(@create_test_name)
+ command(:create, @create_test_name,
+ { NAME => 'a',
+ CACHE_BLOOMS_ON_WRITE => 'TRUE',
+ CACHE_DATA_IN_L1 => 'TRUE',
+ CACHE_INDEX_ON_WRITE => 'TRUE',
+ EVICT_BLOCKS_ON_CLOSE => 'TRUE',
+ COMPRESSION_COMPACT => 'GZ'})
+ assert_equal(['a:'], table(@create_test_name).get_all_columns.sort)
+ assert_match(/CACHE_BLOOMS_ON_WRITE/, admin.describe(@create_test_name))
+ assert_match(/CACHE_DATA_IN_L1/, admin.describe(@create_test_name))
+ assert_match(/CACHE_INDEX_ON_WRITE/, admin.describe(@create_test_name))
+ assert_match(/EVICT_BLOCKS_ON_CLOSE/, admin.describe(@create_test_name))
+ assert_match(/GZ/, admin.describe(@create_test_name))
+ end
+
define_test "create should be able to set table options" do
drop_test_table(@create_test_name)
command(:create, @create_test_name, 'a', 'b', 'MAX_FILESIZE' => 12345678,
- OWNER => '987654321')
+ OWNER => '987654321',
+ PRIORITY => '77',
+ FLUSH_POLICY => 'org.apache.hadoop.hbase.regionserver.FlushAllLargeStoresPolicy',
+ REGION_MEMSTORE_REPLICATION => 'TRUE',
+ SPLIT_POLICY => 'org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy',
+ COMPACTION_ENABLED => 'false')
assert_equal(['a:', 'b:'], table(@create_test_name).get_all_columns.sort)
assert_match(/12345678/, admin.describe(@create_test_name))
assert_match(/987654321/, admin.describe(@create_test_name))
+ assert_match(/77/, admin.describe(@create_test_name))
+ assert_match(/COMPACTION_ENABLED/, admin.describe(@create_test_name))
+ assert_match(/REGION_MEMSTORE_REPLICATION/, admin.describe(@create_test_name))
+ assert_match(/org.apache.hadoop.hbase.regionserver.FlushAllLargeStoresPolicy/,
+ admin.describe(@create_test_name))
+ assert_match(/org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy/,
+ admin.describe(@create_test_name))
end
-
+
define_test "create should ignore table_att" do
drop_test_table(@create_test_name)
command(:create, @create_test_name, 'a', 'b', METHOD => 'table_att', OWNER => '987654321')