You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ja...@apache.org on 2019/07/30 06:52:24 UTC
[hbase] branch master updated: HBASE-22746 Removed deprecated
methods from Delete
This is an automated email from the ASF dual-hosted git repository.
janh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 46a4323 HBASE-22746 Removed deprecated methods from Delete
46a4323 is described below
commit 46a432386eaa9333013541ea0931b882cae61c07
Author: Jan Hentschel <ja...@ultratendency.com>
AuthorDate: Tue Jul 30 08:52:19 2019 +0200
HBASE-22746 Removed deprecated methods from Delete
Signed-off-by: stack <st...@apache.org>
---
.../org/apache/hadoop/hbase/client/Delete.java | 25 ----------------------
.../apache/hadoop/hbase/regionserver/HRegion.java | 3 +--
2 files changed, 1 insertion(+), 27 deletions(-)
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 7c32a68..1df710f 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
@@ -154,20 +154,6 @@ public class Delete extends Mutation {
}
/**
- * 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 cell An existing cell of type "delete".
* @return this for invocation chaining
@@ -309,17 +295,6 @@ public class Delete extends Mutation {
return (Delete) super.setDurability(d);
}
- /**
- * Method for setting the Delete's familyMap
- * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0.
- * Use {@link Delete#Delete(byte[], long, NavigableMap)} instead
- */
- @Deprecated
- @Override
- public Delete setFamilyCellMap(NavigableMap<byte[], List<Cell>> map) {
- return (Delete) super.setFamilyCellMap(map);
- }
-
@Override
public Delete setClusterIds(List<UUID> clusterIds) {
return (Delete) super.setClusterIds(clusterIds);
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 5afbe5d..33cdda6 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -3047,8 +3047,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
*/
void delete(NavigableMap<byte[], List<Cell>> familyMap,
Durability durability) throws IOException {
- Delete delete = new Delete(FOR_UNIT_TESTS_ONLY);
- delete.setFamilyCellMap(familyMap);
+ Delete delete = new Delete(FOR_UNIT_TESTS_ONLY, HConstants.LATEST_TIMESTAMP, familyMap);
delete.setDurability(durability);
doBatchMutate(delete);
}