Index: src/main/java/org/apache/hadoop/hbase/regionserver/HRegionThriftServer.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/regionserver/HRegionThriftServer.java +++ src/main/java/org/apache/hadoop/hbase/regionserver/HRegionThriftServer.java @@ -19,7 +19,7 @@ */ package org.apache.hadoop.hbase.regionserver; -import static org.apache.hadoop.hbase.thrift.ThriftServerRunner.HBaseHandler.toBytes; +import static org.apache.hadoop.hbase.util.Bytes.getBytes; import java.io.IOException; import java.nio.ByteBuffer; @@ -121,9 +121,9 @@ long timestamp, Map attributes) throws IOError { try { - byte[] row = toBytes(rowb); + byte[] row = getBytes(rowb); - HTable table = getTable(toBytes(tableName)); + HTable table = getTable(getBytes(tableName)); HRegionLocation location = table.getRegionLocation(row, false); byte[] regionName = location.getRegionInfo().getRegionName(); @@ -135,7 +135,7 @@ } Get get = new Get(row); for(ByteBuffer column : columns) { - byte [][] famAndQf = KeyValue.parseColumn(toBytes(column)); + byte [][] famAndQf = KeyValue.parseColumn(getBytes(column)); if (famAndQf.length == 1) { get.addFamily(famAndQf[0]); } else { Index: src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java +++ src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java @@ -585,7 +585,7 @@ throws IOError { try{ List hris = - this.getHBaseAdmin().getTableRegions(toBytes(tableName)); + this.getHBaseAdmin().getTableRegions(getBytes(tableName)); List regions = new ArrayList(); if (hris != null) { @@ -606,18 +606,6 @@ } } - /** - * Convert ByteBuffer to byte array. Note that this cannot be replaced by - * Bytes.toBytes(). - */ - public static byte[] toBytes(ByteBuffer bb) { - byte[] result = new byte[bb.remaining()]; - // Make a duplicate so the position doesn't change - ByteBuffer dup = bb.duplicate(); - dup.get(result, 0, result.length); - return result; - } - @Deprecated @Override public List get( @@ -1349,7 +1337,7 @@ public TRegionInfo getRegionInfo(ByteBuffer searchRow) throws IOError { try { HTable table = getTable(HConstants.META_TABLE_NAME); - byte[] row = toBytes(searchRow); + byte[] row = getBytes(searchRow); Result startRowResult = table.getRowOrBefore( row, HConstants.CATALOG_FAMILY);