HBASE-22679 : Revamping CellUtil (#735)

* HBASE-22679 : Revamping CellUtil * checkstyle fix * incorporating review * minor indentation
apache · Oct 22, 2019 · 2ad62b0 · 2ad62b0
1 parent 6e96738
commit 2ad62b0
Show file tree

Hide file tree

Showing 23 changed files with 413 additions and 864 deletions.
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
@@ -687,8 +687,12 @@ private static <T extends Mutation> T toDelta(Function<Bytes, T> supplier, Consu
           if (qv.hasTags()) {
             tags = qv.getTags().toByteArray();
           }
-          consumer.accept(mutation, CellUtil.createCell(mutation.getRow(), family, qualifier, qv.getTimestamp(),
-                  KeyValue.Type.Put, value, tags));
+          consumer.accept(mutation, ExtendedCellBuilderFactory.create(CellBuilderType.DEEP_COPY)
+            .setRow(mutation.getRow()).setFamily(family)
+            .setQualifier(qualifier).setTimestamp(qv.getTimestamp())
+            .setType(KeyValue.Type.Put.getCode()).setValue(value)
+            .setTags(tags).setSequenceId(0)
+            .build());
         }
       }
     }

diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferKeyValue.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ByteBufferKeyValue.java
@@ -180,7 +180,7 @@ public int getValueLength() {
 
   @Override
   public byte[] getTagsArray() {
-    return CellUtil.cloneTags(this);
+    return PrivateCellUtil.cloneTags(this);
   }
 
   @Override