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

HBASE-15782 TestShell fails due to some moved types

This commit is contained in:
tedyu 2016-05-06 06:11:12 -07:00
parent 34e9a6ff30
commit 387c7e6b08
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hbase-shell/src/main/ruby/hbase/admin.rb
View File

@ -24,7 +24,6 @@ java_import org.apache.hadoop.hbase.util.RegionSplitter
java_import org.apache.hadoop.hbase.util.Bytes java_import org.apache.hadoop.hbase.util.Bytes
java_import org.apache.hadoop.hbase.ServerName java_import org.apache.hadoop.hbase.ServerName
java_import org.apache.hadoop.hbase.TableName java_import org.apache.hadoop.hbase.TableName
java_import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos::SnapshotDescription
# Wrapper for org.apache.hadoop.hbase.client.HBaseAdmin # Wrapper for org.apache.hadoop.hbase.client.HBaseAdmin
@ -68,9 +67,9 @@ module Hbase
end end
compact_type = nil compact_type = nil
if type == "NORMAL" if type == "NORMAL"
compact_type = org.apache.hadoop.hbase.client.Admin::CompactType::NORMAL compact_type = org.apache.hadoop.hbase.client.CompactType::NORMAL
elsif type == "MOB" elsif type == "MOB"
compact_type = org.apache.hadoop.hbase.client.Admin::CompactType::MOB compact_type = org.apache.hadoop.hbase.client.CompactType::MOB
else else
raise ArgumentError, "only NORMAL or MOB accepted for type!" raise ArgumentError, "only NORMAL or MOB accepted for type!"
end end
@ -96,9 +95,9 @@ module Hbase
end end
compact_type = nil compact_type = nil
if type == "NORMAL" if type == "NORMAL"
compact_type = org.apache.hadoop.hbase.client.Admin::CompactType::NORMAL compact_type = org.apache.hadoop.hbase.client.CompactType::NORMAL
elsif type == "MOB" elsif type == "MOB"
compact_type = org.apache.hadoop.hbase.client.Admin::CompactType::MOB compact_type = org.apache.hadoop.hbase.client.CompactType::MOB
else else
raise ArgumentError, "only NORMAL or MOB accepted for type!" raise ArgumentError, "only NORMAL or MOB accepted for type!"
end end
@ -955,7 +954,7 @@ module Hbase
args.each do |arg| args.each do |arg|
if arg[SKIP_FLUSH] == true if arg[SKIP_FLUSH] == true
@admin.snapshot(snapshot_name, table_name, @admin.snapshot(snapshot_name, table_name,
SnapshotDescription::Type::SKIPFLUSH) org.apache.hadoop.hbase.client.SnapshotType::SKIPFLUSH)
else else
@admin.snapshot(snapshot_name, table_name) @admin.snapshot(snapshot_name, table_name)
end end