You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by an...@apache.org on 2016/12/15 10:25:14 UTC

hbase git commit: HBASE-17298 remove unused code in HRegion#doMiniBatchMutation. (huaxiang sun)

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 <an...@gmail.com>
Authored: Thu Dec 15 15:54:49 2016 +0530
Committer: anoopsamjohn <an...@gmail.com>
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<byte[]> putsCfSet = null;
-    // The set of columnFamilies first seen for Delete.
-    Set<byte[]> 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