From aa6b9cc3c70213ebab0b2a777837af370db6abba Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Fri, 11 Aug 2017 00:07:11 +0800 Subject: [PATCH] HBASE-18555: Remove redundant familyMap.put() from Put#addColumn() and addImmutable() --- .../src/main/java/org/apache/hadoop/hbase/client/Mutation.java | 1 + hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java index 3b6049729a..25b088df19 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java @@ -111,6 +111,7 @@ public abstract class Mutation extends OperationWithAttributes implements Row, C List list = this.familyMap.get(family); if (list == null) { list = new ArrayList<>(); + this.familyMap.put(family, list); } return list; } diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java index 5c1528f218..b5b10d0879 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java @@ -216,7 +216,6 @@ public class Put extends Mutation implements HeapSize, Comparable { List list = getCellList(family); KeyValue kv = createPutKeyValue(family, qualifier, ts, value); list.add(kv); - familyMap.put(CellUtil.cloneFamily(kv), list); return this; } @@ -238,7 +237,6 @@ public class Put extends Mutation implements HeapSize, Comparable { List list = getCellList(family); list.add(new IndividualBytesFieldCell(this.row, family, qualifier, ts, KeyValue.Type.Put, value)); - familyMap.put(family, list); return this; } @@ -253,7 +251,6 @@ public class Put extends Mutation implements HeapSize, Comparable { List list = getCellList(family); KeyValue kv = createPutKeyValue(family, qualifier, ts, value, tag); list.add(kv); - familyMap.put(family, list); return this; } @@ -272,7 +269,6 @@ public class Put extends Mutation implements HeapSize, Comparable { List list = getCellList(family); KeyValue kv = createPutKeyValue(family, qualifier, ts, value, tag); list.add(kv); - familyMap.put(family, list); return this; } @@ -293,7 +289,6 @@ public class Put extends Mutation implements HeapSize, Comparable { List list = getCellList(family); KeyValue kv = createPutKeyValue(family, qualifier, ts, value, null); list.add(kv); - familyMap.put(CellUtil.cloneFamily(kv), list); return this; } @@ -309,7 +304,6 @@ public class Put extends Mutation implements HeapSize, Comparable { List list = getCellList(family); KeyValue kv = createPutKeyValue(family, qualifier, ts, value, null); list.add(kv); - familyMap.put(family, list); return this; } @@ -330,7 +324,6 @@ public class Put extends Mutation implements HeapSize, Comparable { " doesn't match the original one " + Bytes.toStringBinary(this.row)); } list.add(kv); - familyMap.put(family, list); return this; } -- 2.11.0 (Apple Git-81)