Repository: hbase Updated Branches: refs/heads/branch-2 7c03ea043 -> 1e57aadbe
HBASE-20254 Incorrect help message for merge_region Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1e57aadb Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1e57aadb Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1e57aadb Branch: refs/heads/branch-2 Commit: 1e57aadbe8577dd9b25b2f6732b8288c88b3b556 Parents: 7c03ea0 Author: Peter Somogyi <psomo...@apache.org> Authored: Thu Mar 22 16:55:21 2018 +0100 Committer: Peter Somogyi <psomo...@apache.org> Committed: Mon Mar 26 19:52:55 2018 +0200 ---------------------------------------------------------------------- hbase-shell/src/main/ruby/hbase/admin.rb | 6 ++++-- hbase-shell/src/main/ruby/shell/commands/merge_region.rb | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1e57aadb/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 f35dcb0..e409e39 100644 --- a/hbase-shell/src/main/ruby/hbase/admin.rb +++ b/hbase-shell/src/main/ruby/hbase/admin.rb @@ -468,8 +468,10 @@ module Hbase #---------------------------------------------------------------------------------------------- # Merge two regions - def merge_region(encoded_region_a_name, encoded_region_b_name, force) - @admin.mergeRegions(encoded_region_a_name.to_java_bytes, encoded_region_b_name.to_java_bytes, java.lang.Boolean.valueOf(force)) + def merge_region(region_a_name, region_b_name, force) + @admin.mergeRegions(region_a_name.to_java_bytes, + region_b_name.to_java_bytes, + java.lang.Boolean.valueOf(force)) end #---------------------------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1e57aadb/hbase-shell/src/main/ruby/shell/commands/merge_region.rb ---------------------------------------------------------------------- diff --git a/hbase-shell/src/main/ruby/shell/commands/merge_region.rb b/hbase-shell/src/main/ruby/shell/commands/merge_region.rb index 9c66770..b4f6cae 100644 --- a/hbase-shell/src/main/ruby/shell/commands/merge_region.rb +++ b/hbase-shell/src/main/ruby/shell/commands/merge_region.rb @@ -26,21 +26,23 @@ Merge two regions. Passing 'true' as the optional third parameter will force a merge ('force' merges regardless else merge will fail unless passed adjacent regions. 'force' is for expert use only). -NOTE: You must pass the encoded region name, not the full region name so -this command is a little different from other region operations. The encoded +You can pass the encoded region name or the full region name. The encoded region name is the hash suffix on region names: e.g. if the region name were TestTable,0094429456,1289497600452.527db22f95c8a9e0116f0cc13c680396. then the encoded region name portion is 527db22f95c8a9e0116f0cc13c680396 Examples: + hbase> merge_region 'FULL_REGIONNAME', 'FULL_REGIONNAME' + hbase> merge_region 'FULL_REGIONNAME', 'FULL_REGIONNAME', true + hbase> merge_region 'ENCODED_REGIONNAME', 'ENCODED_REGIONNAME' hbase> merge_region 'ENCODED_REGIONNAME', 'ENCODED_REGIONNAME', true EOF end - def command(encoded_region_a_name, encoded_region_b_name, force = 'false') - admin.merge_region(encoded_region_a_name, encoded_region_b_name, force) + def command(region_a_name, region_b_name, force = 'false') + admin.merge_region(region_a_name, region_b_name, force) end end end
