HBASE-18555: Remove redundant familyMap.put() from addxxx() of sub-classes of Mutation and Query

waterlx · jerryjch · commit 173dce73471d · 2017-08-11T22:49:38.000-07:00
Signed-off-by: Jerry He &lt;jerryjch@apache.org&gt;
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
@@ -137,10 +137,10 @@ public Append add(final Cell cell) {
     List<Cell> list = this.familyMap.get(family);
     if (list == null) {
       list  = new ArrayList<>(1);
+      this.familyMap.put(family, list);
     }
     // find where the new entry should be placed in the List
     list.add(cell);
-    this.familyMap.put(family, list);
     return this;
   }
 
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
@@ -183,9 +183,9 @@ public Delete add(Cell kv) throws IOException {
     List<Cell> list = familyMap.get(family);
     if (list == null) {
       list = new ArrayList<>(1);
+      familyMap.put(family, list);
     }
     list.add(kv);
-    familyMap.put(family, list);
     return this;
   }
 
@@ -219,12 +219,12 @@ public Delete addFamily(final byte [] family, final long timestamp) {
     List<Cell> list = familyMap.get(family);
     if(list == null) {
       list = new ArrayList<>(1);
+      familyMap.put(family, list);
     } else if(!list.isEmpty()) {
       list.clear();
     }
     KeyValue kv = new KeyValue(row, family, null, timestamp, KeyValue.Type.DeleteFamily);
     list.add(kv);
-    familyMap.put(family, list);
     return this;
   }
 
@@ -239,10 +239,10 @@ 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.add(new KeyValue(row, family, null, timestamp,
           KeyValue.Type.DeleteFamilyVersion));
-    familyMap.put(family, list);
     return this;
   }
 
@@ -272,10 +272,10 @@ public Delete addColumns(final byte [] family, final byte [] qualifier, final lo
     List<Cell> list = familyMap.get(family);
     if (list == null) {
       list = new ArrayList<>(1);
+      familyMap.put(family, list);
     }
     list.add(new KeyValue(this.row, family, qualifier, timestamp,
         KeyValue.Type.DeleteColumn));
-    familyMap.put(family, list);
     return this;
   }
 
@@ -307,10 +307,10 @@ public Delete addColumn(byte [] family, byte [] qualifier, long timestamp) {
     List<Cell> list = familyMap.get(family);
     if(list == null) {
       list = new ArrayList<>(1);
+      familyMap.put(family, list);
     }
     KeyValue kv = new KeyValue(this.row, family, qualifier, timestamp, KeyValue.Type.Delete);
     list.add(kv);
-    familyMap.put(family, list);
     return this;
   }
 
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
@@ -205,12 +205,12 @@ public Get addColumn(byte [] family, byte [] qualifier) {
     NavigableSet<byte []> set = familyMap.get(family);
     if(set == null) {
       set = new TreeSet<>(Bytes.BYTES_COMPARATOR);
+      familyMap.put(family, set);
     }
     if (qualifier == null) {
       qualifier = HConstants.EMPTY_BYTE_ARRAY;
     }
     set.add(qualifier);
-    familyMap.put(family, set);
     return this;
   }
 
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java
@@ -102,7 +102,6 @@ public Increment add(Cell cell) throws IOException{
         " doesn't match the original one " +  Bytes.toStringBinary(this.row));
     }
     list.add(cell);
-    familyMap.put(family, list);
     return this;
   }
 
@@ -123,7 +122,6 @@ public Increment addColumn(byte [] family, byte [] qualifier, long amount) {
     List<Cell> list = getCellList(family);
     KeyValue kv = createPutKeyValue(family, qualifier, ts, Bytes.toBytes(amount));
     list.add(kv);
-    familyMap.put(CellUtil.cloneFamily(kv), list);
     return this;
   }
 
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
@@ -111,6 +111,7 @@ List<Cell> getCellList(byte[] family) {
     List<Cell> 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
@@ -216,7 +216,6 @@ public Put addColumn(byte [] family, byte [] qualifier, long ts, byte [] value)
     List<Cell> 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 Put addImmutable(byte [] family, byte [] qualifier, long ts, byte [] valu
 
     List<Cell> 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 Put addImmutable(byte[] family, byte[] qualifier, long ts, byte[] value,
     List<Cell> 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 Put addImmutable(byte[] family, ByteBuffer qualifier, long ts, ByteBuffer
     List<Cell> 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 Put addColumn(byte[] family, ByteBuffer qualifier, long ts, ByteBuffer va
     List<Cell> 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 Put addImmutable(byte[] family, ByteBuffer qualifier, long ts, ByteBuffer
     List<Cell> 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 Put add(Cell kv) throws IOException{
         " doesn't match the original one " +  Bytes.toStringBinary(this.row));
     }
     list.add(kv);
-    familyMap.put(family, list);
     return this;
   }
 
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java
@@ -340,12 +340,12 @@ public Scan addColumn(byte [] family, byte [] qualifier) {
     NavigableSet<byte []> set = familyMap.get(family);
     if(set == null) {
       set = new TreeSet<>(Bytes.BYTES_COMPARATOR);
+      familyMap.put(family, set);
     }
     if (qualifier == null) {
       qualifier = HConstants.EMPTY_BYTE_ARRAY;
     }
     set.add(qualifier);
-    familyMap.put(family, set);
     return this;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -137,10 +137,10 @@ public Append add(final Cell cell) {`
`137`	`137`	`List<Cell> list = this.familyMap.get(family);`
`138`	`138`	`if (list == null) {`
`139`	`139`	`list = new ArrayList<>(1);`
	`140`	`+ this.familyMap.put(family, list);`
`140`	`141`	`}`
`141`	`142`	`// find where the new entry should be placed in the List`
`142`	`143`	`list.add(cell);`
`143`		`- this.familyMap.put(family, list);`
`144`	`144`	`return this;`
`145`	`145`	`}`
`146`	`146`
Original file line number	Diff line number	Diff line change
`@@ -183,9 +183,9 @@ public Delete add(Cell kv) throws IOException {`
`183`	`183`	`List<Cell> list = familyMap.get(family);`
`184`	`184`	`if (list == null) {`
`185`	`185`	`list = new ArrayList<>(1);`
	`186`	`+ familyMap.put(family, list);`
`186`	`187`	`}`
`187`	`188`	`list.add(kv);`
`188`		`- familyMap.put(family, list);`
`189`	`189`	`return this;`
`190`	`190`	`}`
`191`	`191`
`@@ -219,12 +219,12 @@ public Delete addFamily(final byte [] family, final long timestamp) {`
`219`	`219`	`List<Cell> list = familyMap.get(family);`
`220`	`220`	`if(list == null) {`
`221`	`221`	`list = new ArrayList<>(1);`
	`222`	`+ familyMap.put(family, list);`
`222`	`223`	`} else if(!list.isEmpty()) {`
`223`	`224`	`list.clear();`
`224`	`225`	`}`
`225`	`226`	`KeyValue kv = new KeyValue(row, family, null, timestamp, KeyValue.Type.DeleteFamily);`
`226`	`227`	`list.add(kv);`
`227`		`- familyMap.put(family, list);`
`228`	`228`	`return this;`
`229`	`229`	`}`
`230`	`230`
`@@ -239,10 +239,10 @@ public Delete addFamilyVersion(final byte [] family, final long timestamp) {`
`239`	`239`	`List<Cell> list = familyMap.get(family);`
`240`	`240`	`if(list == null) {`
`241`	`241`	`list = new ArrayList<>(1);`
	`242`	`+ familyMap.put(family, list);`
`242`	`243`	`}`
`243`	`244`	`list.add(new KeyValue(row, family, null, timestamp,`
`244`	`245`	`KeyValue.Type.DeleteFamilyVersion));`
`245`		`- familyMap.put(family, list);`
`246`	`246`	`return this;`
`247`	`247`	`}`
`248`	`248`
`@@ -272,10 +272,10 @@ public Delete addColumns(final byte [] family, final byte [] qualifier, final lo`
`272`	`272`	`List<Cell> list = familyMap.get(family);`
`273`	`273`	`if (list == null) {`
`274`	`274`	`list = new ArrayList<>(1);`
	`275`	`+ familyMap.put(family, list);`
`275`	`276`	`}`
`276`	`277`	`list.add(new KeyValue(this.row, family, qualifier, timestamp,`
`277`	`278`	`KeyValue.Type.DeleteColumn));`
`278`		`- familyMap.put(family, list);`
`279`	`279`	`return this;`
`280`	`280`	`}`
`281`	`281`
`@@ -307,10 +307,10 @@ public Delete addColumn(byte [] family, byte [] qualifier, long timestamp) {`
`307`	`307`	`List<Cell> list = familyMap.get(family);`
`308`	`308`	`if(list == null) {`
`309`	`309`	`list = new ArrayList<>(1);`
	`310`	`+ familyMap.put(family, list);`
`310`	`311`	`}`
`311`	`312`	`KeyValue kv = new KeyValue(this.row, family, qualifier, timestamp, KeyValue.Type.Delete);`
`312`	`313`	`list.add(kv);`
`313`		`- familyMap.put(family, list);`
`314`	`314`	`return this;`
`315`	`315`	`}`
`316`	`316`
Original file line number	Diff line number	Diff line change
`@@ -205,12 +205,12 @@ public Get addColumn(byte [] family, byte [] qualifier) {`
`205`	`205`	`NavigableSet<byte []> set = familyMap.get(family);`
`206`	`206`	`if(set == null) {`
`207`	`207`	`set = new TreeSet<>(Bytes.BYTES_COMPARATOR);`
	`208`	`+ familyMap.put(family, set);`
`208`	`209`	`}`
`209`	`210`	`if (qualifier == null) {`
`210`	`211`	`qualifier = HConstants.EMPTY_BYTE_ARRAY;`
`211`	`212`	`}`
`212`	`213`	`set.add(qualifier);`
`213`		`- familyMap.put(family, set);`
`214`	`214`	`return this;`
`215`	`215`	`}`
`216`	`216`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,6 @@ public Increment add(Cell cell) throws IOException{`
`102`	`102`	`" doesn't match the original one " + Bytes.toStringBinary(this.row));`
`103`	`103`	`}`
`104`	`104`	`list.add(cell);`
`105`		`- familyMap.put(family, list);`
`106`	`105`	`return this;`
`107`	`106`	`}`
`108`	`107`
`@@ -123,7 +122,6 @@ public Increment addColumn(byte [] family, byte [] qualifier, long amount) {`
`123`	`122`	`List<Cell> list = getCellList(family);`
`124`	`123`	`KeyValue kv = createPutKeyValue(family, qualifier, ts, Bytes.toBytes(amount));`
`125`	`124`	`list.add(kv);`
`126`		`- familyMap.put(CellUtil.cloneFamily(kv), list);`
`127`	`125`	`return this;`
`128`	`126`	`}`
`129`	`127`
Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ List<Cell> getCellList(byte[] family) {`
`111`	`111`	`List<Cell> list = this.familyMap.get(family);`
`112`	`112`	`if (list == null) {`
`113`	`113`	`list = new ArrayList<>();`
	`114`	`+ this.familyMap.put(family, list);`
`114`	`115`	`}`
`115`	`116`	`return list;`
`116`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,6 @@ public Put addColumn(byte [] family, byte [] qualifier, long ts, byte [] value)`
`216`	`216`	`List<Cell> list = getCellList(family);`
`217`	`217`	`KeyValue kv = createPutKeyValue(family, qualifier, ts, value);`
`218`	`218`	`list.add(kv);`
`219`		`- familyMap.put(CellUtil.cloneFamily(kv), list);`
`220`	`219`	`return this;`
`221`	`220`	`}`
`222`	`221`
`@@ -238,7 +237,6 @@ public Put addImmutable(byte [] family, byte [] qualifier, long ts, byte [] valu`
`238`	`237`
`239`	`238`	`List<Cell> list = getCellList(family);`
`240`	`239`	`list.add(new IndividualBytesFieldCell(this.row, family, qualifier, ts, KeyValue.Type.Put, value));`
`241`		`- familyMap.put(family, list);`
`242`	`240`	`return this;`
`243`	`241`	`}`
`244`	`242`
`@@ -253,7 +251,6 @@ public Put addImmutable(byte[] family, byte[] qualifier, long ts, byte[] value,`
`253`	`251`	`List<Cell> list = getCellList(family);`
`254`	`252`	`KeyValue kv = createPutKeyValue(family, qualifier, ts, value, tag);`
`255`	`253`	`list.add(kv);`
`256`		`- familyMap.put(family, list);`
`257`	`254`	`return this;`
`258`	`255`	`}`
`259`	`256`
`@@ -272,7 +269,6 @@ public Put addImmutable(byte[] family, ByteBuffer qualifier, long ts, ByteBuffer`
`272`	`269`	`List<Cell> list = getCellList(family);`
`273`	`270`	`KeyValue kv = createPutKeyValue(family, qualifier, ts, value, tag);`
`274`	`271`	`list.add(kv);`
`275`		`- familyMap.put(family, list);`
`276`	`272`	`return this;`
`277`	`273`	`}`
`278`	`274`
`@@ -293,7 +289,6 @@ public Put addColumn(byte[] family, ByteBuffer qualifier, long ts, ByteBuffer va`
`293`	`289`	`List<Cell> list = getCellList(family);`
`294`	`290`	`KeyValue kv = createPutKeyValue(family, qualifier, ts, value, null);`
`295`	`291`	`list.add(kv);`
`296`		`- familyMap.put(CellUtil.cloneFamily(kv), list);`
`297`	`292`	`return this;`
`298`	`293`	`}`
`299`	`294`
`@@ -309,7 +304,6 @@ public Put addImmutable(byte[] family, ByteBuffer qualifier, long ts, ByteBuffer`
`309`	`304`	`List<Cell> list = getCellList(family);`
`310`	`305`	`KeyValue kv = createPutKeyValue(family, qualifier, ts, value, null);`
`311`	`306`	`list.add(kv);`
`312`		`- familyMap.put(family, list);`
`313`	`307`	`return this;`
`314`	`308`	`}`
`315`	`309`
`@@ -330,7 +324,6 @@ public Put add(Cell kv) throws IOException{`
`330`	`324`	`" doesn't match the original one " + Bytes.toStringBinary(this.row));`
`331`	`325`	`}`
`332`	`326`	`list.add(kv);`
`333`		`- familyMap.put(family, list);`
`334`	`327`	`return this;`
`335`	`328`	`}`
`336`	`329`
Original file line number	Diff line number	Diff line change
`@@ -340,12 +340,12 @@ public Scan addColumn(byte [] family, byte [] qualifier) {`
`340`	`340`	`NavigableSet<byte []> set = familyMap.get(family);`
`341`	`341`	`if(set == null) {`
`342`	`342`	`set = new TreeSet<>(Bytes.BYTES_COMPARATOR);`
	`343`	`+ familyMap.put(family, set);`
`343`	`344`	`}`
`344`	`345`	`if (qualifier == null) {`
`345`	`346`	`qualifier = HConstants.EMPTY_BYTE_ARRAY;`
`346`	`347`	`}`
`347`	`348`	`set.add(qualifier);`
`348`		`- familyMap.put(family, set);`
`349`	`349`	`return this;`
`350`	`350`	`}`
`351`	`351`