hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1155164 - in /hbase/trunk: CHANGES.txt src/main/ruby/hbase/admin.rb
Date Tue, 09 Aug 2011 00:15:41 GMT
Author: stack
Date: Tue Aug  9 00:15:41 2011
New Revision: 1155164

URL: http://svn.apache.org/viewvc?rev=1155164&view=rev
Log:
HBase shell move and online may be unusable if region name or server includes binary-encoded
data

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/ruby/hbase/admin.rb

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1155164&r1=1155163&r2=1155164&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Aug  9 00:15:41 2011
@@ -408,6 +408,12 @@ Release 0.91.0 - Unreleased
    HBASE-2233  Support both Hadoop 0.20 and 0.22
    HBASE-3857  Change the HFile Format (Mikhail & Liyin)
 
+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

Modified: hbase/trunk/src/main/ruby/hbase/admin.rb
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/ruby/hbase/admin.rb?rev=1155164&r1=1155163&r2=1155164&view=diff
==============================================================================
--- hbase/trunk/src/main/ruby/hbase/admin.rb (original)
+++ hbase/trunk/src/main/ruby/hbase/admin.rb Tue Aug  9 00:15:41 2011
@@ -231,7 +231,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
 
     #----------------------------------------------------------------------------------------------
@@ -435,7 +435,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



Mime
View raw message