Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-13358 Upgrade VisibilityClient API to accept Connection object. ANOTHER ADDENDUM - fix visibility label shell admin

This commit is contained in:
Srikanth Srungarapu 2015-05-01 15:46:11 -07:00
parent 8bffd45bd5
commit 58689b4a00
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hbase-shell/src/main/ruby/hbase/visibility_labels.rb
View File

@ -26,8 +26,8 @@ module Hbase
def initialize(admin, formatter) def initialize(admin, formatter)
@admin = admin @admin = admin
@config = @admin.getConfiguration()
@formatter = formatter @formatter = formatter
@connection = @admin.getConnection()
end end
def close def close
@ -45,7 +45,7 @@ module Hbase
end end
begin begin
response = VisibilityClient.addLabels(@config, labels.to_java(:string)) response = VisibilityClient.addLabels(@connection, labels.to_java(:string))
if response.nil? if response.nil?
raise(ArgumentError, "DISABLED: Visibility labels feature is not available") raise(ArgumentError, "DISABLED: Visibility labels feature is not available")
end end
@ -70,7 +70,7 @@ module Hbase
end end
begin begin
response = VisibilityClient.setAuths(@config, auths.to_java(:string), user) response = VisibilityClient.setAuths(@connection, auths.to_java(:string), user)
if response.nil? if response.nil?
raise(ArgumentError, "DISABLED: Visibility labels feature is not available") raise(ArgumentError, "DISABLED: Visibility labels feature is not available")
end end
@ -90,7 +90,7 @@ module Hbase
def get_auths(user) def get_auths(user)
lables_table_available? lables_table_available?
begin begin
response = VisibilityClient.getAuths(@config, user) response = VisibilityClient.getAuths(@connection, user)
if response.nil? if response.nil?
raise(ArgumentError, "DISABLED: Visibility labels feature is not available") raise(ArgumentError, "DISABLED: Visibility labels feature is not available")
end end
@ -104,7 +104,7 @@ module Hbase
def list_labels(regex = ".*") def list_labels(regex = ".*")
lables_table_available? lables_table_available?
begin begin
response = VisibilityClient.listLabels(@config, regex) response = VisibilityClient.listLabels(@connection, regex)
if response.nil? if response.nil?
raise(ArgumentError, "DISABLED: Visibility labels feature is not available") raise(ArgumentError, "DISABLED: Visibility labels feature is not available")
end end
@ -123,7 +123,7 @@ module Hbase
end end
begin begin
response = VisibilityClient.clearAuths(@config, auths.to_java(:string), user) response = VisibilityClient.clearAuths(@connection, auths.to_java(:string), user)
if response.nil? if response.nil?
raise(ArgumentError, "DISABLED: Visibility labels feature is not available") raise(ArgumentError, "DISABLED: Visibility labels feature is not available")
end end