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/07/19 23:21:58 UTC

[22/22] hbase git commit: HBASE-17496 RSGroup shell commands:get_server_rsgroup don't work and commands display an incorrect result size (Guangxu Cheng)

HBASE-17496 RSGroup shell commands:get_server_rsgroup don't work and commands display an incorrect result size (Guangxu Cheng)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5cc50d45
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5cc50d45
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5cc50d45

Branch: refs/heads/HBASE-15631-branch-1
Commit: 5cc50d4511dd2ad34808da01299f894a8f8a4ebf
Parents: 200afdb
Author: Andrew Purtell <ap...@apache.org>
Authored: Wed Jul 5 18:23:19 2017 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed Jul 19 16:21:10 2017 -0700

----------------------------------------------------------------------
 hbase-shell/src/main/ruby/shell/commands/get_rsgroup.rb        | 5 ++---
 hbase-shell/src/main/ruby/shell/commands/get_server_rsgroup.rb | 5 ++---
 hbase-shell/src/main/ruby/shell/commands/get_table_rsgroup.rb  | 3 +--
 hbase-shell/src/main/ruby/shell/commands/list_rsgroups.rb      | 3 +--
 4 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/5cc50d45/hbase-shell/src/main/ruby/shell/commands/get_rsgroup.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/shell/commands/get_rsgroup.rb b/hbase-shell/src/main/ruby/shell/commands/get_rsgroup.rb
index 122020a..a5b41af 100644
--- a/hbase-shell/src/main/ruby/shell/commands/get_rsgroup.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/get_rsgroup.rb
@@ -33,12 +33,11 @@ EOF
       end
 
       def command(group_name)
-        now = Time.now
-        formatter.header(['RSGROUP '.concat(group_name)])
+        formatter.header(['GROUP INFORMATION'])
         rsgroup_admin.get_rsgroup(group_name) do |s|
           formatter.row([s])
         end
-        formatter.footer(now)
+        formatter.footer()
       end
     end
   end

http://git-wip-us.apache.org/repos/asf/hbase/blob/5cc50d45/hbase-shell/src/main/ruby/shell/commands/get_server_rsgroup.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/shell/commands/get_server_rsgroup.rb b/hbase-shell/src/main/ruby/shell/commands/get_server_rsgroup.rb
index dddf080..fd2ccc7 100644
--- a/hbase-shell/src/main/ruby/shell/commands/get_server_rsgroup.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/get_server_rsgroup.rb
@@ -33,10 +33,9 @@ EOF
       end
 
       def command(server)
-        now = Time.now
-        group_name = rsgroup_admin.getRSGroupOfServer(server).getName
+        group_name = rsgroup_admin.get_rsgroup_of_server(server).getName
         formatter.row([group_name])
-        formatter.footer(now, 1)
+        formatter.footer(1)
       end
     end
   end

http://git-wip-us.apache.org/repos/asf/hbase/blob/5cc50d45/hbase-shell/src/main/ruby/shell/commands/get_table_rsgroup.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/shell/commands/get_table_rsgroup.rb b/hbase-shell/src/main/ruby/shell/commands/get_table_rsgroup.rb
index 6939c12..9684687 100644
--- a/hbase-shell/src/main/ruby/shell/commands/get_table_rsgroup.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/get_table_rsgroup.rb
@@ -33,11 +33,10 @@ EOF
       end
 
       def command(table)
-        now = Time.now
         group_name =
             rsgroup_admin.get_rsgroup_of_table(table).getName
         formatter.row([group_name])
-        formatter.footer(now, 1)
+        formatter.footer(1)
       end
     end
   end

http://git-wip-us.apache.org/repos/asf/hbase/blob/5cc50d45/hbase-shell/src/main/ruby/shell/commands/list_rsgroups.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/shell/commands/list_rsgroups.rb b/hbase-shell/src/main/ruby/shell/commands/list_rsgroups.rb
index 5ab923a..393797d 100644
--- a/hbase-shell/src/main/ruby/shell/commands/list_rsgroups.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/list_rsgroups.rb
@@ -35,7 +35,6 @@ EOF
       end
 
       def command(regex = '.*')
-        now = Time.now
         formatter.header(['GROUPS'])
 
         regex = /#{regex}/ unless regex.is_a?(Regexp)
@@ -44,7 +43,7 @@ EOF
           formatter.row([group])
         end
 
-        formatter.footer(now, list.size)
+        formatter.footer(list.size)
       end
     end
   end