Author: stack
Date: Tue Aug 9 00:16:54 2011
New Revision: 1155165
URL: http://svn.apache.org/viewvc?rev=1155165&view=rev
Log:
HBase shell move and online may be unusable if region name or server includes
binary-encoded data
Modified:
hbase/branches/0.90/CHANGES.txt
hbase/branches/0.90/src/main/ruby/hbase/admin.rb
Modified: hbase/branches/0.90/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1155165&r1=1155164&r2=1155165&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Tue Aug 9 00:16:54 2011
@@ -1,4 +1,9 @@
HBase Change Log
+Release 0.90.5 - Unreleased
+ BUG FIXES
+ HBASE-4160 HBase shell move and online may be unusable if region name or
+ server includes binary-encoded data (Jonathan Hsieh)
+
Release 0.90.4 - Unreleased
BUG FIXES
HBASE-3617 NoRouteToHostException during balancing will cause Master abort
Modified: hbase/branches/0.90/src/main/ruby/hbase/admin.rb
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/ruby/hbase/admin.rb?rev=1155165&r1=1155164&r2=1155165&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/ruby/hbase/admin.rb (original)
+++ hbase/branches/0.90/src/main/ruby/hbase/admin.rb Tue Aug 9 00:16:54 2011
@@ -179,7 +179,7 @@ module Hbase
#----------------------------------------------------------------------------------------------
# Move a region
def move(encoded_region_name, server = nil)
-
@admin.move(org.apache.hadoop.hbase.util.Bytes.toBytes(encoded_region_name),
server ? org.apache.hadoop.hbase.util.Bytes.toBytes(server): nil)
+ @admin.move(encoded_region_name.to_java_bytes, server ?
server.to_java_bytes: nil)
end
#----------------------------------------------------------------------------------------------
@@ -384,7 +384,7 @@ module Hbase
# Read region info
# FIXME: fail gracefully if can't find the region
- region_bytes = org.apache.hadoop.hbase.util.Bytes.toBytes(region_name)
+ region_bytes = region_name.to_java_bytes
g = org.apache.hadoop.hbase.client.Get.new(region_bytes)
g.addColumn(org.apache.hadoop.hbase.HConstants::CATALOG_FAMILY,
org.apache.hadoop.hbase.HConstants::REGIONINFO_QUALIFIER)
hri_bytes = meta.get(g).value
