HBASE-15782 TestShell fails due to some moved types
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/387c7e6b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/387c7e6b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/387c7e6b Branch: refs/heads/hbase-12439 Commit: 387c7e6b083fddeae2a7ebe1fef3546f38ef9fb5 Parents: 34e9a6f Author: tedyu <[email protected]> Authored: Fri May 6 06:11:12 2016 -0700 Committer: tedyu <[email protected]> Committed: Fri May 6 06:11:12 2016 -0700 ---------------------------------------------------------------------- hbase-shell/src/main/ruby/hbase/admin.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/387c7e6b/hbase-shell/src/main/ruby/hbase/admin.rb ---------------------------------------------------------------------- diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb b/hbase-shell/src/main/ruby/hbase/admin.rb index 88486c0..7ea315f 100644 --- a/hbase-shell/src/main/ruby/hbase/admin.rb +++ b/hbase-shell/src/main/ruby/hbase/admin.rb @@ -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.ServerName 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 @@ -68,9 +67,9 @@ module Hbase end compact_type = nil 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" - compact_type = org.apache.hadoop.hbase.client.Admin::CompactType::MOB + compact_type = org.apache.hadoop.hbase.client.CompactType::MOB else raise ArgumentError, "only NORMAL or MOB accepted for type!" end @@ -96,9 +95,9 @@ module Hbase end compact_type = nil 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" - compact_type = org.apache.hadoop.hbase.client.Admin::CompactType::MOB + compact_type = org.apache.hadoop.hbase.client.CompactType::MOB else raise ArgumentError, "only NORMAL or MOB accepted for type!" end @@ -955,7 +954,7 @@ module Hbase args.each do |arg| if arg[SKIP_FLUSH] == true @admin.snapshot(snapshot_name, table_name, - SnapshotDescription::Type::SKIPFLUSH) + org.apache.hadoop.hbase.client.SnapshotType::SKIPFLUSH) else @admin.snapshot(snapshot_name, table_name) end
