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/08/23 18:56:24 UTC
[hbase] branch master updated: HBASE-22755 Removed deprecated
methods from Mutation
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 808f051 HBASE-22755 Removed deprecated methods from Mutation
808f051 is described below
commit 808f051b8a0ac645566ce1f5ab19b64abf8b8321
Author: Jan Hentschel <ja...@ultratendency.com>
AuthorDate: Fri Aug 23 20:56:19 2019 +0200
HBASE-22755 Removed deprecated methods from Mutation
Signed-off-by: stack <st...@apache.org>
---
.../org/apache/hadoop/hbase/client/Mutation.java | 24 ----------------------
.../java/org/apache/hadoop/hbase/client/Put.java | 11 ----------
.../org/apache/hadoop/hbase/wal/WALSplitUtil.java | 3 ++-
.../regionserver/TestSerialReplicationChecker.java | 2 +-
.../TestHBaseFsckCleanReplicationBarriers.java | 2 +-
5 files changed, 4 insertions(+), 38 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 8bfdf89..a561632 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
@@ -302,19 +302,6 @@ public abstract class Mutation extends OperationWithAttributes implements Row, C
}
/**
- * Method for setting the mutation's familyMap
- * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0.
- * Use {@link Mutation#Mutation(byte[], long, NavigableMap)} instead
- */
- @Deprecated
- public Mutation setFamilyCellMap(NavigableMap<byte [], List<Cell>> map) {
- // TODO: Shut this down or move it up to be a Constructor. Get new object rather than change
- // this internal data member.
- this.familyMap = map;
- return this;
- }
-
- /**
* Method to check if the familyMap is empty
* @return true if empty, false otherwise
*/
@@ -342,17 +329,6 @@ public abstract class Mutation extends OperationWithAttributes implements Row, C
}
/**
- * Method for retrieving the timestamp
- * @return timestamp
- * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0.
- * Use {@link #getTimestamp()} instead
- */
- @Deprecated
- public long getTimeStamp() {
- return this.getTimestamp();
- }
-
- /**
* Method for retrieving the timestamp.
*
* @return timestamp
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 90db12c..21f22d1 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
@@ -249,17 +249,6 @@ public class Put extends Mutation implements HeapSize {
return (Put) super.setDurability(d);
}
- /**
- * Method for setting the put's familyMap
- * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0.
- * Use {@link Put#Put(byte[], long, NavigableMap)} instead
- */
- @Deprecated
- @Override
- public Put setFamilyCellMap(NavigableMap<byte[], List<Cell>> map) {
- return (Put) super.setFamilyCellMap(map);
- }
-
@Override
public Put setClusterIds(List<UUID> clusterIds) {
return (Put) super.setClusterIds(clusterIds);
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitUtil.java
index b9ccc49..3aba309 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitUtil.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitUtil.java
@@ -45,6 +45,7 @@ import org.apache.hadoop.hbase.client.Durability;
import org.apache.hadoop.hbase.client.Mutation;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.RegionInfo;
+import org.apache.hadoop.hbase.client.Row;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.wal.AbstractFSWAL;
import org.apache.hadoop.hbase.util.Bytes;
@@ -453,7 +454,7 @@ public final class WALSplitUtil {
@Override
public int compareTo(final MutationReplay d) {
- return this.mutation.compareTo(d.mutation);
+ return Row.COMPARATOR.compare(mutation, d.mutation);
}
@Override
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestSerialReplicationChecker.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestSerialReplicationChecker.java
index 29749bd..cebe942 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestSerialReplicationChecker.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestSerialReplicationChecker.java
@@ -157,7 +157,7 @@ public class TestSerialReplicationChecker {
}
for (int i = 0; i < barriers.length; i++) {
put.addColumn(HConstants.REPLICATION_BARRIER_FAMILY, HConstants.SEQNUM_QUALIFIER,
- put.getTimeStamp() - barriers.length + i, Bytes.toBytes(barriers[i]));
+ put.getTimestamp() - barriers.length + i, Bytes.toBytes(barriers[i]));
}
try (Table table = UTIL.getConnection().getTable(TableName.META_TABLE_NAME)) {
table.put(put);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckCleanReplicationBarriers.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckCleanReplicationBarriers.java
index 375f2ed..21ad20c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckCleanReplicationBarriers.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckCleanReplicationBarriers.java
@@ -189,7 +189,7 @@ public class TestHBaseFsckCleanReplicationBarriers {
}
for (int i = 0; i < barriers.length; i++) {
put.addColumn(HConstants.REPLICATION_BARRIER_FAMILY, HConstants.SEQNUM_QUALIFIER,
- put.getTimeStamp() - barriers.length + i, Bytes.toBytes(barriers[i]));
+ put.getTimestamp() - barriers.length + i, Bytes.toBytes(barriers[i]));
}
try (Table table = UTIL.getConnection().getTable(TableName.META_TABLE_NAME)) {
table.put(put);