Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A18959C8C for ; Thu, 22 Mar 2012 20:44:17 +0000 (UTC) Received: (qmail 88376 invoked by uid 500); 22 Mar 2012 20:44:17 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 88348 invoked by uid 500); 22 Mar 2012 20:44:17 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 88339 invoked by uid 99); 22 Mar 2012 20:44:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Mar 2012 20:44:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Mar 2012 20:44:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0509D2388A3D for ; Thu, 22 Mar 2012 20:43:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1304047 - in /hbase/trunk/src/main/java/org/apache/hadoop/hbase: regionserver/HRegionThriftServer.java thrift/ThriftServerRunner.java Date: Thu, 22 Mar 2012 20:43:55 -0000 To: commits@hbase.apache.org From: tedyu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120322204356.0509D2388A3D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tedyu Date: Thu Mar 22 20:43:55 2012 New Revision: 1304047 URL: http://svn.apache.org/viewvc?rev=1304047&view=rev Log: HBASE-5591 ThiftServerRunner.HBaseHandler.toBytes() is identical to Bytes.getBytes() (Scott Chen) Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionThriftServer.java hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionThriftServer.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionThriftServer.java?rev=1304047&r1=1304046&r2=1304047&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionThriftServer.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionThriftServer.java Thu Mar 22 20:43:55 2012 @@ -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 @@ public class HRegionThriftServer extends 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 @@ public class HRegionThriftServer extends } 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 { Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java?rev=1304047&r1=1304046&r2=1304047&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java Thu Mar 22 20:43:55 2012 @@ -585,7 +585,7 @@ public class ThriftServerRunner implemen 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 @@ public class ThriftServerRunner implemen } } - /** - * 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 class ThriftServerRunner implemen 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);