HBASE-4913 Addendum: better shell parsing

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1408424 13f79535-47bb-0310-9956-ffa450edef68

hbase-server/src/main/ruby/hbase/admin.rb

@@ -51,25 +51,23 @@ module Hbase
 
     #----------------------------------------------------------------------------------------------
     # Requests a table or region or column family compaction
-    def compact(table_or_region_name, *args)
+    def compact(table_or_region_name, family)
-      if args.empty?
+      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, family)
-        @admin.compact(table_or_region_name, column_family)
       end
     end
 
     #----------------------------------------------------------------------------------------------
     # Requests a table or region or column family major compaction
-    def major_compact(table_or_region_name, *args)
+    def major_compact(table_or_region_name, family)
-      if args.empty?
+      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, family)
-        @admin.majorCompact(table_or_region_name, column_family)
       end
     end
 

hbase-server/src/main/ruby/shell/commands/compact.rb

@@ -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

hbase-server/src/main/ruby/shell/commands/major_compact.rb

@@ -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