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 C600217BF0 for ; Fri, 27 Mar 2015 00:59:30 +0000 (UTC) Received: (qmail 21369 invoked by uid 500); 27 Mar 2015 00:59:30 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 21327 invoked by uid 500); 27 Mar 2015 00:59:30 -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 21318 invoked by uid 99); 27 Mar 2015 00:59:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Mar 2015 00:59:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5637EE2F28; Fri, 27 Mar 2015 00:59:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tedyu@apache.org To: commits@hbase.apache.org Message-Id: <4da3bd14a2ab4484b9cba39b0670b304@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-13327 Addendum replaced the nested try with a cast of getAdmin() to HBaseAdmin and a call to the original compact/majorCompact method (Solomon) Date: Fri, 27 Mar 2015 00:59:30 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1 797eee33a -> 9d6aa4a8d HBASE-13327 Addendum replaced the nested try with a cast of getAdmin() to HBaseAdmin and a call to the original compact/majorCompact method (Solomon) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9d6aa4a8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9d6aa4a8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9d6aa4a8 Branch: refs/heads/branch-1 Commit: 9d6aa4a8df39cb44dec2d36c11f0a4d51c73febb Parents: 797eee3 Author: tedyu Authored: Thu Mar 26 17:59:24 2015 -0700 Committer: tedyu Committed: Thu Mar 26 17:59:24 2015 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/thrift/ThriftServerRunner.java | 21 +++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/9d6aa4a8/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java index 59971bb..045cf1f 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java @@ -66,6 +66,7 @@ import org.apache.hadoop.hbase.client.Append; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Increment; import org.apache.hadoop.hbase.client.OperationWithAttributes; @@ -778,13 +779,11 @@ public class ThriftServerRunner implements Runnable { @Override public void compact(ByteBuffer tableNameOrRegionName) throws IOError { - byte[] tableNameOrRegionNameArray = getBytes(tableNameOrRegionName); try { - try { - getAdmin().compactRegion(tableNameOrRegionNameArray); - } catch (IllegalArgumentException e) { - getAdmin().compact(TableName.valueOf(tableNameOrRegionNameArray)); - } + // TODO: HBaseAdmin.compact(byte[]) deprecated and not trivial to replace here. + // ThriftServerRunner.compact should be deprecated and replaced with methods specific to + // table and region. + ((HBaseAdmin) getAdmin()).compact(getBytes(tableNameOrRegionName)); } catch (IOException e) { LOG.warn(e.getMessage(), e); throw new IOError(e.getMessage()); @@ -793,13 +792,11 @@ public class ThriftServerRunner implements Runnable { @Override public void majorCompact(ByteBuffer tableNameOrRegionName) throws IOError { - byte[] tableNameOrRegionNameArray = getBytes(tableNameOrRegionName); try { - try { - getAdmin().majorCompactRegion(tableNameOrRegionNameArray); - } catch (IllegalArgumentException e) { - getAdmin().majorCompact(TableName.valueOf(tableNameOrRegionNameArray)); - } + // TODO: HBaseAdmin.majorCompact(byte[]) deprecated and not trivial to replace here. + // ThriftServerRunner.majorCompact should be deprecated and replaced with methods specific + // to table and region. + ((HBaseAdmin) getAdmin()).majorCompact(getBytes(tableNameOrRegionName)); } catch (IOException e) { LOG.warn(e.getMessage(), e); throw new IOError(e.getMessage());