You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/11/07 22:07:06 UTC

svn commit: r1406805 - in /hbase/trunk/hbase-server/src/main/ruby: hbase/admin.rb shell/commands/list.rb

Author: stack
Date: Wed Nov  7 21:07:05 2012
New Revision: 1406805

URL: http://svn.apache.org/viewvc?rev=1406805&view=rev
Log:
HBASE-6969 Avoid unneceseary regular expression matching in ruby code for "list" command

Modified:
    hbase/trunk/hbase-server/src/main/ruby/hbase/admin.rb
    hbase/trunk/hbase-server/src/main/ruby/shell/commands/list.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=1406805&r1=1406804&r2=1406805&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/ruby/hbase/admin.rb (original)
+++ hbase/trunk/hbase-server/src/main/ruby/hbase/admin.rb Wed Nov  7 21:07:05 2012
@@ -39,8 +39,8 @@ module Hbase
 
     #----------------------------------------------------------------------------------------------
     # Returns a list of tables in hbase
-    def list
-      @admin.listTables.map { |t| t.getNameAsString }
+    def list(regex = ".*")
+        @admin.listTables(regex).map { |t| t.getNameAsString }
     end
 
     #----------------------------------------------------------------------------------------------

Modified: hbase/trunk/hbase-server/src/main/ruby/shell/commands/list.rb
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/ruby/shell/commands/list.rb?rev=1406805&r1=1406804&r2=1406805&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/ruby/shell/commands/list.rb (original)
+++ hbase/trunk/hbase-server/src/main/ruby/shell/commands/list.rb Wed Nov  7 21:07:05 2012
@@ -34,8 +34,7 @@ EOF
         now = Time.now
         formatter.header([ "TABLE" ])
 
-        regex = /#{regex}/ unless regex.is_a?(Regexp)
-        list = admin.list.grep(regex)
+        list = admin.list(regex)
         list.each do |table|
           formatter.row([ table ])
         end