Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6929E200BE2 for ; Thu, 15 Dec 2016 11:25:16 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 67BA1160B10; Thu, 15 Dec 2016 10:25:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B12BD160B0B for ; Thu, 15 Dec 2016 11:25:15 +0100 (CET) Received: (qmail 91014 invoked by uid 500); 15 Dec 2016 10:25:14 -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 91005 invoked by uid 99); 15 Dec 2016 10:25:14 -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; Thu, 15 Dec 2016 10:25:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BF1FFE3908; Thu, 15 Dec 2016 10:25:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anoopsamjohn@apache.org To: commits@hbase.apache.org Message-Id: <0a822455cbef4ace968c14be710527de@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-17298 remove unused code in HRegion#doMiniBatchMutation. (huaxiang sun) Date: Thu, 15 Dec 2016 10:25:14 +0000 (UTC) archived-at: Thu, 15 Dec 2016 10:25:16 -0000 Repository: hbase Updated Branches: refs/heads/master a5a603688 -> f9750f212 HBASE-17298 remove unused code in HRegion#doMiniBatchMutation. (huaxiang sun) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f9750f21 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f9750f21 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f9750f21 Branch: refs/heads/master Commit: f9750f2122afb047d84ef2b8fcbec9b4872ccf30 Parents: a5a6036 Author: anoopsamjohn Authored: Thu Dec 15 15:54:49 2016 +0530 Committer: anoopsamjohn Committed: Thu Dec 15 15:54:49 2016 +0530 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/HRegion.java | 26 -------------------- 1 file changed, 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/f9750f21/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 7364162..3cc40b0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -3133,14 +3133,6 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi // TODO: This needs a rewrite. Doesn't have to be this long. St.Ack 20160120 private void doMiniBatchMutate(BatchOperation batchOp) throws IOException { boolean replay = batchOp.isInReplay(); - // Variable to note if all Put items are for the same CF -- metrics related - boolean putsCfSetConsistent = true; - // Variable to note if all Delete items are for the same CF -- metrics related - boolean deletesCfSetConsistent = true; - // The set of columnFamilies first seen for Put. - Set putsCfSet = null; - // The set of columnFamilies first seen for Delete. - Set deletesCfSet = null; long currentNonceGroup = HConstants.NO_NONCE; long currentNonce = HConstants.NO_NONCE; WALEdit walEdit = null; @@ -3190,24 +3182,6 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi cellCount += cells.size(); } } - if (mutation instanceof Put) { - // If Column Families stay consistent through out all of the - // individual puts then metrics can be reported as a multiput across - // column families in the first put. - if (putsCfSet == null) { - putsCfSet = mutation.getFamilyCellMap().keySet(); - } else { - putsCfSetConsistent = putsCfSetConsistent - && mutation.getFamilyCellMap().keySet().equals(putsCfSet); - } - } else { - if (deletesCfSet == null) { - deletesCfSet = mutation.getFamilyCellMap().keySet(); - } else { - deletesCfSetConsistent = deletesCfSetConsistent - && mutation.getFamilyCellMap().keySet().equals(deletesCfSet); - } - } } // We've now grabbed as many mutations off the list as we can