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 2013/08/14 17:03:36 UTC
svn commit: r1513921 - in /hbase/trunk/hbase-server/src/main:
java/org/apache/hadoop/hbase/master/HMaster.java ruby/hbase/admin.rb
Author: stack
Date: Wed Aug 14 15:03:35 2013
New Revision: 1513921
URL: http://svn.apache.org/r1513921
Log:
HBASE-9182 Allow non-admin users to list all table names
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
hbase/trunk/hbase-server/src/main/ruby/hbase/admin.rb
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1513921&r1=1513920&r2=1513921&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Wed Aug 14 15:03:35 2013
@@ -2633,7 +2633,7 @@ MasterServices, Server {
}
/**
- * Get list of table names
+ * Get list of userspace table names
* @param controller Unused (set to null).
* @param req GetTableNamesRequest
* @return GetTableNamesResponse
@@ -2645,6 +2645,9 @@ MasterServices, Server {
Collection<HTableDescriptor> descriptors = this.tableDescriptors.getAll().values();
GetTableNamesResponse.Builder builder = GetTableNamesResponse.newBuilder();
for (HTableDescriptor descriptor: descriptors) {
+ if (descriptor.isMetaTable()) {
+ continue;
+ }
builder.addTableNames(ProtobufUtil.toProtoTableName(descriptor.getTableName()));
}
return builder.build();
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=1513921&r1=1513920&r2=1513921&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/ruby/hbase/admin.rb (original)
+++ hbase/trunk/hbase-server/src/main/ruby/hbase/admin.rb Wed Aug 14 15:03:35 2013
@@ -18,6 +18,7 @@
#
include Java
+java_import java.util.Arrays
java_import org.apache.hadoop.hbase.util.Pair
java_import org.apache.hadoop.hbase.util.RegionSplitter
java_import org.apache.hadoop.hbase.util.Bytes
@@ -42,7 +43,7 @@ module Hbase
#----------------------------------------------------------------------------------------------
# Returns a list of tables in hbase
def list(regex = ".*")
- @admin.getTableNames(regex)
+ Arrays.asList(@admin.getTableNames(regex))
end
#----------------------------------------------------------------------------------------------