You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2017/08/20 21:30:34 UTC
[37/50] [abbrv] hbase git commit: HBASE-18573 Update Append and
Delete to use Mutation#getCellList(family)
HBASE-18573 Update Append and Delete to use Mutation#getCellList(family)
Signed-off-by: Jerry He <je...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4c3a64db
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4c3a64db
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4c3a64db
Branch: refs/heads/HBASE-18467
Commit: 4c3a64db13b086ad3d8a6ffa1be8ba2f5a24719c
Parents: 5d2c3dd
Author: Xiang Li <wa...@gmail.com>
Authored: Thu Aug 17 00:39:35 2017 +0800
Committer: Jerry He <je...@apache.org>
Committed: Wed Aug 16 14:50:46 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/4c3a64db/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 2bd0860..6947313 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
@@ -134,11 +134,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<>(1);
- 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/4c3a64db/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 bf5241c..66b6cfc 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
@@ -180,11 +180,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<>(1);
- familyMap.put(family, list);
- }
+ List<Cell> list = getCellList(family);
list.add(kv);
return this;
}
@@ -216,11 +212,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<>(1);
- 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);
@@ -236,11 +229,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<>(1);
- familyMap.put(family, list);
- }
+ List<Cell> list = getCellList(family);
list.add(new KeyValue(row, family, null, timestamp,
KeyValue.Type.DeleteFamilyVersion));
return this;
@@ -269,11 +258,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<>(1);
- familyMap.put(family, list);
- }
+ List<Cell> list = getCellList(family);
list.add(new KeyValue(this.row, family, qualifier, timestamp,
KeyValue.Type.DeleteColumn));
return this;
@@ -304,11 +289,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<>(1);
- 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;