hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerry...@apache.org
Subject hbase git commit: HBASE-18573 Update Append and Delete to use Mutation#getCellList(family)
Date Wed, 16 Aug 2017 22:13:15 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 1f1ab8c87 -> 54aaf6bfb


HBASE-18573 Update Append and Delete to use Mutation#getCellList(family)

Signed-off-by: Jerry He <jerryjch@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/54aaf6bf
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/54aaf6bf
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/54aaf6bf

Branch: refs/heads/branch-1
Commit: 54aaf6bfb72815c343885f7ec40edbe20e4bc394
Parents: 1f1ab8c
Author: Xiang Li <waterlx@gmail.com>
Authored: Thu Aug 17 00:39:35 2017 +0800
Committer: Jerry He <jerryjch@apache.org>
Committed: Wed Aug 16 15:12:56 2017 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/client/Append.java  |  9 +++---
 .../org/apache/hadoop/hbase/client/Delete.java  | 31 ++++----------------
 2 files changed, 10 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/54aaf6bf/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
index 0741a0d..efc958d 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
@@ -122,11 +122,10 @@ public class Append extends Mutation {
   public Append add(final Cell cell) {
     // Presume it is KeyValue for now.
     byte [] family = CellUtil.cloneFamily(cell);
-    List<Cell> list = this.familyMap.get(family);
-    if (list == null) {
-      list  = new ArrayList<Cell>();
-      this.familyMap.put(family, list);
-    }
+
+    // Get cell list for the family
+    List<Cell> list = getCellList(family);
+
     // find where the new entry should be placed in the List
     list.add(cell);
     return this;

http://git-wip-us.apache.org/repos/asf/hbase/blob/54aaf6bf/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
index 8682eae..e45ae59 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
@@ -170,11 +170,7 @@ public class Delete extends Mutation implements Comparable<Row>
{
         " doesn't match the original one " +  Bytes.toStringBinary(this.row));
     }
     byte [] family = CellUtil.cloneFamily(kv);
-    List<Cell> list = familyMap.get(family);
-    if (list == null) {
-      list = new ArrayList<Cell>();
-      familyMap.put(family, list);
-    }
+    List<Cell> list = getCellList(family);
     list.add(kv);
     return this;
   }
@@ -236,11 +232,8 @@ public class Delete extends Mutation implements Comparable<Row>
{
     if (timestamp < 0) {
       throw new IllegalArgumentException("Timestamp cannot be negative. ts=" + timestamp);
     }
-    List<Cell> list = familyMap.get(family);
-    if(list == null) {
-      list = new ArrayList<Cell>();
-      familyMap.put(family, list);
-    } else if(!list.isEmpty()) {
+    List<Cell> list = getCellList(family);
+    if(!list.isEmpty()) {
       list.clear();
     }
     KeyValue kv = new KeyValue(row, family, null, timestamp, KeyValue.Type.DeleteFamily);
@@ -269,11 +262,7 @@ public class Delete extends Mutation implements Comparable<Row>
{
    * @return this for invocation chaining
    */
   public Delete addFamilyVersion(final byte [] family, final long timestamp) {
-    List<Cell> list = familyMap.get(family);
-    if(list == null) {
-      list = new ArrayList<Cell>();
-      familyMap.put(family, list);
-    }
+    List<Cell> list = getCellList(family);
     list.add(new KeyValue(row, family, null, timestamp,
           KeyValue.Type.DeleteFamilyVersion));
     return this;
@@ -328,11 +317,7 @@ public class Delete extends Mutation implements Comparable<Row>
{
     if (timestamp < 0) {
       throw new IllegalArgumentException("Timestamp cannot be negative. ts=" + timestamp);
     }
-    List<Cell> list = familyMap.get(family);
-    if (list == null) {
-      list = new ArrayList<Cell>();
-      familyMap.put(family, list);
-    }
+    List<Cell> list = getCellList(family);
     list.add(new KeyValue(this.row, family, qualifier, timestamp,
         KeyValue.Type.DeleteColumn));
     return this;
@@ -391,11 +376,7 @@ public class Delete extends Mutation implements Comparable<Row>
{
     if (timestamp < 0) {
       throw new IllegalArgumentException("Timestamp cannot be negative. ts=" + timestamp);
     }
-    List<Cell> list = familyMap.get(family);
-    if(list == null) {
-      list = new ArrayList<Cell>();
-      familyMap.put(family, list);
-    }
+    List<Cell> list = getCellList(family);
     KeyValue kv = new KeyValue(this.row, family, qualifier, timestamp, KeyValue.Type.Delete);
     list.add(kv);
     return this;


Mime
View raw message