HBASE-18515 Introduce Delete.add as a replacement for Delete#addDeleteMarker

Signed-off-by: Chia-Ping Tsai <chia7712@gmail.com>

hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java

@@ -151,15 +151,26 @@ public class Delete extends Mutation implements Comparable<Row> {
   }
 
   /**
-   * Advanced use only.
+   * Advanced use only. Add an existing delete marker to this Delete object.
+   * @param kv An existing KeyValue of type "delete".
+   * @return this for invocation chaining
+   * @throws IOException
+   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0. Use {@link #add(Cell)}
+   *             instead
+   */
+  @SuppressWarnings("unchecked")
+  @Deprecated
+  public Delete addDeleteMarker(Cell kv) throws IOException {
+    return this.add(kv);
+  }
+
+  /**
    * Add an existing delete marker to this Delete object.
    * @param kv An existing KeyValue of type "delete".
    * @return this for invocation chaining
    * @throws IOException
    */
-  @SuppressWarnings("unchecked")
+  public Delete add(Cell kv) throws IOException {
-  public Delete addDeleteMarker(Cell kv) throws IOException {
-    // TODO: Deprecate and rename 'add' so it matches how we add KVs to Puts.
     if (!CellUtil.isDelete(kv)) {
       throw new IOException("The recently added KeyValue is not of type "
           + "delete. Rowkey: " + Bytes.toStringBinary(this.row));
@@ -178,7 +189,6 @@ public class Delete extends Mutation implements Comparable<Row> {
     return this;
   }
 
-
   /**
    * Delete all versions of all columns of the specified family.
    * <p>

hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java

@@ -580,7 +580,7 @@ public final class ProtobufUtil {
           delete =
             new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength(), timestamp);
         }
-        delete.addDeleteMarker(cell);
+        delete.add(cell);
       }
     } else {
       if (delete == null) {

hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java

@@ -730,7 +730,7 @@ public final class ProtobufUtil {
           delete =
             new Delete(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength(), timestamp);
         }
-        delete.addDeleteMarker(cell);
+        delete.add(cell);
       }
     } else {
       if (delete == null) {

hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java

@@ -548,7 +548,7 @@ public class TestRowProcessorEndpoint {
             KeyValue kvDelete =
                 new KeyValue(rows[i], CellUtil.cloneFamily(kv), CellUtil.cloneQualifier(kv), 
                     kv.getTimestamp(), KeyValue.Type.Delete);
-            d.addDeleteMarker(kvDelete);
+            d.add(kvDelete);
             Put p = new Put(rows[1 - i]);
             KeyValue kvAdd =
                 new KeyValue(rows[1 - i], CellUtil.cloneFamily(kv), CellUtil.cloneQualifier(kv),

hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java

@@ -354,7 +354,7 @@ public class Import extends Configured implements Tool {
          */
         if (CellUtil.isDeleteFamily(kv)) {
           Delete deleteFamily = new Delete(key.get());
-          deleteFamily.addDeleteMarker(kv);
+          deleteFamily.add(kv);
           if (durability != null) {
             deleteFamily.setDurability(durability);
           }
@@ -364,7 +364,7 @@ public class Import extends Configured implements Tool {
           if (delete == null) {
             delete = new Delete(key.get());
           }
-          delete.addDeleteMarker(kv);
+          delete.add(kv);
         } else {
           if (put == null) {
             put = new Put(key.get());

hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java

@@ -182,7 +182,7 @@ public class WALPlayer extends Configured implements Tool {
                 }
               }
               if (CellUtil.isDelete(cell)) {
-                del.addDeleteMarker(cell);
+                del.add(cell);
               } else {
                 put.add(cell);
               }

hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java

@@ -191,7 +191,7 @@ public class ReplicationSink {
               addToHashMultiMap(rowMap, table, clusterIds, m);
             }
             if (CellUtil.isDelete(cell)) {
-              ((Delete) m).addDeleteMarker(cell);
+              ((Delete) m).add(cell);
             } else {
               ((Put) m).add(cell);
             }

hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java

@@ -400,7 +400,7 @@ public class VisibilityController implements MasterObserver, RegionObserver,
                 p.add(cell);
               } else if (m instanceof Delete) {
                 Delete d = (Delete) m;
-                d.addDeleteMarker(cell);
+                d.add(cell);
               }
             }
           }

hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java

@@ -2376,7 +2376,7 @@ public class WALSplitter {
         }
       }
       if (CellUtil.isDelete(cell)) {
-        ((Delete) m).addDeleteMarker(cell);
+        ((Delete) m).add(cell);
       } else {
         ((Put) m).add(cell);
       }