Skip to content

Commit b316753

Browse files
authored
HBASE-30065: Address existing Rubocop errors/warning (#8041)
Signed-off-by: Viraj Jasani <vjasani@apache.org>
1 parent 31e5517 commit b316753

9 files changed

Lines changed: 191 additions & 178 deletions

File tree

hbase-shell/src/main/ruby/hbase/hbase.rb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,20 @@
1717
# limitations under the License.
1818
#
1919

20-
include Java
21-
java_import org.apache.hadoop.hbase.client.ConnectionFactory
22-
java_import org.apache.hadoop.hbase.HBaseConfiguration
23-
2420
require 'hbase/admin'
2521
require 'hbase/table'
2622
require 'hbase/taskmonitor'
2723
require 'hbase/quotas'
2824
require 'hbase/security'
2925
require 'hbase/visibility_labels'
3026

27+
# HBase module containing the main connection and admin classes
3128
module Hbase
29+
include Java
30+
java_import org.apache.hadoop.hbase.client.ConnectionFactory
31+
java_import org.apache.hadoop.hbase.HBaseConfiguration
32+
33+
# Main HBase class for connection and admin operations
3234
class Hbase
3335
attr_accessor :configuration
3436

hbase-shell/src/main/ruby/hbase_constants.rb

Lines changed: 81 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
#
24
#
35
# Licensed to the Apache Software Foundation (ASF) under one
@@ -25,89 +27,92 @@
2527
# the hirb.rb HBase Shell script; they don't make much sense elsewhere.
2628
# For example, the exists method on Admin class prints to the formatter
2729
# whether the table exists and returns nil regardless.
28-
include Java
29-
30-
java_import('java.lang.Integer') { |_package, name| "J#{name}" }
31-
java_import('java.lang.Long') { |_package, name| "J#{name}" }
32-
java_import('java.lang.Boolean') { |_package, name| "J#{name}" }
3330

31+
# HBase constants module providing access to HBase Java constants and
32+
# dynamically loading column family and table descriptor constants
3433
module HBaseConstants
35-
ALLOW_PARTIAL_RESULTS = 'ALLOW_PARTIAL_RESULTS'.freeze
36-
ALL_METRICS = 'ALL_METRICS'.freeze
37-
ATTRIBUTES = 'ATTRIBUTES'.freeze
38-
AUTHORIZATIONS = 'AUTHORIZATIONS'.freeze
39-
BATCH = 'BATCH'.freeze
40-
CACHE = 'CACHE'.freeze
41-
CACHE_BLOCKS = 'CACHE_BLOCKS'.freeze
42-
CLASSNAME = 'CLASSNAME'.freeze
43-
CLONE_SFT = 'CLONE_SFT'.freeze
44-
CLUSTER_KEY = 'CLUSTER_KEY'.freeze
45-
COLUMN = 'COLUMN'.freeze
46-
COLUMNS = 'COLUMNS'.freeze
47-
CONFIG = 'CONFIG'.freeze
34+
include Java
35+
36+
java_import('java.lang.Integer') { |_package, name| "J#{name}" }
37+
java_import('java.lang.Long') { |_package, name| "J#{name}" }
38+
java_import('java.lang.Boolean') { |_package, name| "J#{name}" }
39+
40+
ALLOW_PARTIAL_RESULTS = 'ALLOW_PARTIAL_RESULTS'
41+
ALL_METRICS = 'ALL_METRICS'
42+
ATTRIBUTES = 'ATTRIBUTES'
43+
AUTHORIZATIONS = 'AUTHORIZATIONS'
44+
BATCH = 'BATCH'
45+
CACHE = 'CACHE'
46+
CACHE_BLOCKS = 'CACHE_BLOCKS'
47+
CLASSNAME = 'CLASSNAME'
48+
CLONE_SFT = 'CLONE_SFT'
49+
CLUSTER_KEY = 'CLUSTER_KEY'
50+
COLUMN = 'COLUMN'
51+
COLUMNS = 'COLUMNS'
52+
CONFIG = 'CONFIG'
4853
CONFIGURATION = org.apache.hadoop.hbase.HConstants::CONFIGURATION
49-
CONSISTENCY = 'CONSISTENCY'.freeze
50-
COPROCESSOR = 'COPROCESSOR'.freeze
51-
DATA = 'DATA'.freeze
52-
ENDPOINT_CLASSNAME = 'ENDPOINT_CLASSNAME'.freeze
53-
FILTER = 'FILTER'.freeze
54+
CONSISTENCY = 'CONSISTENCY'
55+
COPROCESSOR = 'COPROCESSOR'
56+
DATA = 'DATA'
57+
ENDPOINT_CLASSNAME = 'ENDPOINT_CLASSNAME'
58+
FILTER = 'FILTER'
5459
FOREVER = org.apache.hadoop.hbase.HConstants::FOREVER
55-
FORMATTER = 'FORMATTER'.freeze
56-
FORMATTER_CLASS = 'FORMATTER_CLASS'.freeze
57-
INTERVAL = 'INTERVAL'.freeze
60+
FORMATTER = 'FORMATTER'
61+
FORMATTER_CLASS = 'FORMATTER_CLASS'
62+
INTERVAL = 'INTERVAL'
5863
IN_MEMORY = org.apache.hadoop.hbase.HConstants::IN_MEMORY
5964
IN_MEMORY_COMPACTION = org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder::IN_MEMORY_COMPACTION
60-
ISOLATION_LEVEL = 'ISOLATION_LEVEL'.freeze
61-
IS_ROOT = 'IS_ROOT'.freeze
62-
JAR_PATH = 'JAR_PATH'.freeze
63-
LIMIT = 'LIMIT'.freeze
64-
LOCALITY_THRESHOLD = 'LOCALITY_THRESHOLD'.freeze
65-
MAXLENGTH = 'MAXLENGTH'.freeze
66-
MAX_RESULT_SIZE = 'MAX_RESULT_SIZE'.freeze
65+
ISOLATION_LEVEL = 'ISOLATION_LEVEL'
66+
IS_ROOT = 'IS_ROOT'
67+
JAR_PATH = 'JAR_PATH'
68+
LIMIT = 'LIMIT'
69+
LOCALITY_THRESHOLD = 'LOCALITY_THRESHOLD'
70+
MAXLENGTH = 'MAXLENGTH'
71+
MAX_RESULT_SIZE = 'MAX_RESULT_SIZE'
6772
METADATA = org.apache.hadoop.hbase.HConstants::METADATA
68-
METHOD = 'METHOD'.freeze
69-
METRICS = 'METRICS'.freeze
73+
METHOD = 'METHOD'
74+
METRICS = 'METRICS'
7075
NAME = org.apache.hadoop.hbase.HConstants::NAME
71-
NAMESPACE = 'NAMESPACE'.freeze
72-
NAMESPACES = 'NAMESPACES'.freeze
73-
NONE = 'NONE'.freeze
74-
NUMREGIONS = 'NUMREGIONS'.freeze
75-
POLICY = 'POLICY'.freeze
76-
PRIORITY = 'PRIORITY'.freeze
77-
PROPERTIES = 'PROPERTIES'.freeze
78-
RAW = 'RAW'.freeze
79-
READ_TYPE = 'READ_TYPE'.freeze
80-
REGEX = 'REGEX'.freeze
81-
REGIONSERVER = 'REGIONSERVER'.freeze
82-
REGION_REPLICATION = 'REGION_REPLICATION'.freeze
83-
REGION_REPLICA_ID = 'REGION_REPLICA_ID'.freeze
84-
REMOTE_WAL_DIR = 'REMOTE_WAL_DIR'.freeze
85-
REPLICATION_SCOPE = 'REPLICATION_SCOPE'.freeze
76+
NAMESPACE = 'NAMESPACE'
77+
NAMESPACES = 'NAMESPACES'
78+
NONE = 'NONE'
79+
NUMREGIONS = 'NUMREGIONS'
80+
POLICY = 'POLICY'
81+
PRIORITY = 'PRIORITY'
82+
PROPERTIES = 'PROPERTIES'
83+
RAW = 'RAW'
84+
READ_TYPE = 'READ_TYPE'
85+
REGEX = 'REGEX'
86+
REGIONSERVER = 'REGIONSERVER'
87+
REGION_REPLICATION = 'REGION_REPLICATION'
88+
REGION_REPLICA_ID = 'REGION_REPLICA_ID'
89+
REMOTE_WAL_DIR = 'REMOTE_WAL_DIR'
90+
REPLICATION_SCOPE = 'REPLICATION_SCOPE'
8691
REPLICATION_SCOPE_BYTES = org.apache.hadoop.hbase.client.ColumnFamilyDescriptor::REPLICATION_SCOPE_BYTES
87-
RESTORE_ACL = 'RESTORE_ACL'.freeze
88-
REVERSED = 'REVERSED'.freeze
89-
ROWPREFIXFILTER = 'ROWPREFIXFILTER'.freeze
90-
SERIAL = 'SERIAL'.freeze
91-
SERVER_NAME = 'SERVER_NAME'.freeze
92-
SKIP_FLUSH = 'SKIP_FLUSH'.freeze
93-
SPLITALGO = 'SPLITALGO'.freeze
94-
SPLITS = 'SPLITS'.freeze
95-
SPLITS_FILE = 'SPLITS_FILE'.freeze
96-
STARTROW = 'STARTROW'.freeze
97-
STATE = 'STATE'.freeze
98-
STOPROW = 'STOPROW'.freeze
99-
TABLE = 'TABLE'.freeze
100-
TABLE_CFS = 'TABLE_CFS'.freeze
101-
TABLE_NAME = 'TABLE_NAME'.freeze
102-
TABLE_NAMES = 'TABLE_NAMES'.freeze
103-
TIMERANGE = 'TIMERANGE'.freeze
104-
TIMESTAMP = 'TIMESTAMP'.freeze
105-
TYPE = 'TYPE'.freeze
106-
USER = 'USER'.freeze
107-
VALUE = 'VALUE'.freeze
92+
RESTORE_ACL = 'RESTORE_ACL'
93+
REVERSED = 'REVERSED'
94+
ROWPREFIXFILTER = 'ROWPREFIXFILTER'
95+
SERIAL = 'SERIAL'
96+
SERVER_NAME = 'SERVER_NAME'
97+
SKIP_FLUSH = 'SKIP_FLUSH'
98+
SPLITALGO = 'SPLITALGO'
99+
SPLITS = 'SPLITS'
100+
SPLITS_FILE = 'SPLITS_FILE'
101+
STARTROW = 'STARTROW'
102+
STATE = 'STATE'
103+
STOPROW = 'STOPROW'
104+
TABLE = 'TABLE'
105+
TABLE_CFS = 'TABLE_CFS'
106+
TABLE_NAME = 'TABLE_NAME'
107+
TABLE_NAMES = 'TABLE_NAMES'
108+
TIMERANGE = 'TIMERANGE'
109+
TIMESTAMP = 'TIMESTAMP'
110+
TYPE = 'TYPE'
111+
USER = 'USER'
112+
VALUE = 'VALUE'
108113
VERSIONS = org.apache.hadoop.hbase.HConstants::VERSIONS
109-
VISIBILITY = 'VISIBILITY'.freeze
110-
REOPEN_REGIONS = 'REOPEN_REGIONS'.freeze
114+
VISIBILITY = 'VISIBILITY'
115+
REOPEN_REGIONS = 'REOPEN_REGIONS'
111116

112117
# aliases
113118
ENDKEY = STOPROW
@@ -119,8 +124,9 @@ def self.promote_constants(constants)
119124
# The constants to import are all in uppercase
120125
constants.each do |c|
121126
next if c =~ /DEFAULT_.*/ || c != c.upcase
122-
next if eval("defined?(#{c})")
123-
eval("#{c} = '#{c}'")
127+
next if const_defined?(c)
128+
129+
const_set(c, c.to_s)
124130
end
125131
end
126132

hbase-shell/src/main/ruby/irb/hirb.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def output_value(omit = false)
7272
super(omit) unless @context.last_value.nil?
7373
end
7474

75-
# Copied from https://github.com/ruby/irb/blob/v1.4.2/lib/irb.rb
75+
# Copied from https://github.com/ruby/irb/blob/v1.4.2/lib/irb.rb
7676
# We override the rescue Exception block so the
7777
# Shell::exception_handler can deal with the exceptions.
7878
def eval_input
@@ -186,7 +186,7 @@ def eval_input
186186
warn "WARN: '#{var}' is a reserved HBase command. Local variable assignment ignored."
187187
end
188188

189-
new_binding = @context.workspace.main.get_binding
189+
new_binding = @context.workspace.main.to_binding
190190
(workspace_binding.local_variables - shadowing_vars).each do |var|
191191
new_binding.local_variable_set(var, workspace_binding.local_variable_get(var))
192192
end

hbase-shell/src/main/ruby/jar-bootstrap.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def add_to_configuration(c, arg)
172172
@hbase = conf_from_cli.nil? ? Hbase::Hbase.new : Hbase::Hbase.new(conf_from_cli)
173173

174174
# Setup console
175-
@shell = Shell::Shell.new(@hbase, interactive)
175+
@shell = Shell::Shell.new(@hbase, interactive: interactive)
176176
@shell.debug = @shell_debug
177177

178178
##
@@ -227,7 +227,7 @@ def debug?
227227
IRB.conf[:USE_COLORIZE] = colorize
228228

229229
# Create a workspace we'll use across sessions.
230-
workspace = @shell.get_workspace
230+
workspace = @shell.workspace
231231

232232
# If script2run, try running it. If we're in interactive mode, will go on to run the shell unless
233233
# script calls 'exit' or 'exit 0' or 'exit errcode'.

0 commit comments

Comments
 (0)