You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gc...@apache.org on 2012/11/12 20:51:04 UTC
svn commit: r1408424 - in /hbase/trunk/hbase-server/src/main/ruby:
hbase/admin.rb shell/commands/compact.rb shell/commands/major_compact.rb
Author: gchanan
Date: Mon Nov 12 19:51:04 2012
New Revision: 1408424
URL: http://svn.apache.org/viewvc?rev=1408424&view=rev
Log:
HBASE-4913 Addendum: better shell parsing
Modified:
hbase/trunk/hbase-server/src/main/ruby/hbase/admin.rb
hbase/trunk/hbase-server/src/main/ruby/shell/commands/compact.rb
hbase/trunk/hbase-server/src/main/ruby/shell/commands/major_compact.rb
Modified: hbase/trunk/hbase-server/src/main/ruby/hbase/admin.rb
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/ruby/hbase/admin.rb?rev=1408424&r1=1408423&r2=1408424&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/ruby/hbase/admin.rb (original)
+++ hbase/trunk/hbase-server/src/main/ruby/hbase/admin.rb Mon Nov 12 19:51:04 2012
@@ -51,25 +51,23 @@ module Hbase
#----------------------------------------------------------------------------------------------
# Requests a table or region or column family compaction
- def compact(table_or_region_name, *args)
- if args.empty?
+ def compact(table_or_region_name, family)
+ if family == nil
@admin.compact(table_or_region_name)
- elsif args.length == 1
+ else
# We are compacting a column family within a region.
- column_family = args.first
- @admin.compact(table_or_region_name, column_family)
+ @admin.compact(table_or_region_name, family)
end
end
#----------------------------------------------------------------------------------------------
# Requests a table or region or column family major compaction
- def major_compact(table_or_region_name, *args)
- if args.empty?
+ def major_compact(table_or_region_name, family)
+ if family == nil
@admin.majorCompact(table_or_region_name)
- elsif args.length == 1
+ else
# We are major compacting a column family within a region or table.
- column_family = args.first
- @admin.majorCompact(table_or_region_name, column_family)
+ @admin.majorCompact(table_or_region_name, family)
end
end
Modified: hbase/trunk/hbase-server/src/main/ruby/shell/commands/compact.rb
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/ruby/shell/commands/compact.rb?rev=1408424&r1=1408423&r2=1408424&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/ruby/shell/commands/compact.rb (original)
+++ hbase/trunk/hbase-server/src/main/ruby/shell/commands/compact.rb Mon Nov 12 19:51:04 2012
@@ -37,9 +37,9 @@ module Shell
EOF
end
- def command(table_or_region_name, *args)
+ def command(table_or_region_name, family = nil)
format_simple_command do
- admin.compact(table_or_region_name, *args)
+ admin.compact(table_or_region_name, family)
end
end
end
Modified: hbase/trunk/hbase-server/src/main/ruby/shell/commands/major_compact.rb
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/ruby/shell/commands/major_compact.rb?rev=1408424&r1=1408423&r2=1408424&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/ruby/shell/commands/major_compact.rb (original)
+++ hbase/trunk/hbase-server/src/main/ruby/shell/commands/major_compact.rb Mon Nov 12 19:51:04 2012
@@ -38,9 +38,9 @@ module Shell
EOF
end
- def command(table_or_region_name, *args)
+ def command(table_or_region_name, family = nil)
format_simple_command do
- admin.major_compact(table_or_region_name, *args)
+ admin.major_compact(table_or_region_name, family)
end
end
end