This is an automated email from the ASF dual-hosted git repository.
zhangduo 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 21cb00e HBASE-22064 Remove Admin.deleteSnapshot(byte[])
21cb00e is described below
commit 21cb00eef6e56f5227b34b673982c74b80df371d
Author: pingsutw <[email protected]>
AuthorDate: Sat Mar 23 21:27:12 2019 +0800
HBASE-22064 Remove Admin.deleteSnapshot(byte[])
Signed-off-by: zhangduo <[email protected]>
---
.../src/main/java/org/apache/hadoop/hbase/client/Admin.java | 10 ----------
.../main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java | 5 -----
.../org/apache/hadoop/hbase/client/TestSnapshotFromClient.java | 2 +-
.../hadoop/hbase/client/TestSnapshotTemporaryDirectory.java | 6 +++---
.../hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java | 2 +-
.../hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java | 2 +-
.../org/apache/hadoop/hbase/thrift2/client/ThriftAdmin.java | 5 -----
7 files changed, 6 insertions(+), 26 deletions(-)
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java
index 82b259b..b27e93d 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java
@@ -1514,16 +1514,6 @@ public interface Admin extends Abortable, Closeable {
*
* @param snapshotName name of the snapshot
* @throws IOException if a remote or network exception occurs
- * @deprecated Since 2.2.0. Will be removed in 3.0.0. Use {@link
#deleteSnapshot(String)} instead.
- */
- @Deprecated
- void deleteSnapshot(byte[] snapshotName) throws IOException;
-
- /**
- * Delete an existing snapshot.
- *
- * @param snapshotName name of the snapshot
- * @throws IOException if a remote or network exception occurs
*/
void deleteSnapshot(String snapshotName) throws IOException;
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
index 51e126c..91f9584 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
@@ -2473,11 +2473,6 @@ public class HBaseAdmin implements Admin {
}
@Override
- public void deleteSnapshot(final byte[] snapshotName) throws IOException {
- deleteSnapshot(Bytes.toString(snapshotName));
- }
-
- @Override
public void deleteSnapshot(final String snapshotName) throws IOException {
// make sure the snapshot is possibly valid
TableName.isLegalFullyQualifiedTableName(Bytes.toBytes(snapshotName));
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java
index ad4b84c..45a3620 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java
@@ -216,7 +216,7 @@ public class TestSnapshotFromClient {
// take a snapshot of the disabled table
final String SNAPSHOT_NAME = "offlineTableSnapshot";
- byte[] snapshot = Bytes.toBytes(SNAPSHOT_NAME);
+ String snapshot = SNAPSHOT_NAME;
admin.snapshot(new SnapshotDescription(SNAPSHOT_NAME, TABLE_NAME,
SnapshotType.DISABLED, null, -1,
SnapshotManifestV1.DESCRIPTOR_VERSION));
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotTemporaryDirectory.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotTemporaryDirectory.java
index 589b31d..0f7cff1 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotTemporaryDirectory.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotTemporaryDirectory.java
@@ -306,7 +306,7 @@ public class TestSnapshotTemporaryDirectory {
// take a snapshot of the disabled table
final String SNAPSHOT_NAME = "offlineTableSnapshot";
- byte[] snapshot = Bytes.toBytes(SNAPSHOT_NAME);
+ String snapshot = SNAPSHOT_NAME;
takeSnapshot(TABLE_NAME, SNAPSHOT_NAME, true);
LOG.debug("Snapshot completed.");
@@ -390,8 +390,8 @@ public class TestSnapshotTemporaryDirectory {
LOG);
// take a snapshot of the disabled table
- byte[] snapshot = Bytes.toBytes("testOfflineTableSnapshotWithEmptyRegion");
- takeSnapshot(TABLE_NAME, Bytes.toString(snapshot), true);
+ String snapshot = "testOfflineTableSnapshotWithEmptyRegion";
+ takeSnapshot(TABLE_NAME, snapshot, true);
LOG.debug("Snapshot completed.");
// make sure we have the snapshot
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java
index fd183fc..20ab334 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java
@@ -313,7 +313,7 @@ public class TestSnapshotFromMaster {
// take a snapshot of the table
String snapshotName = "snapshot";
- byte[] snapshotNameBytes = Bytes.toBytes(snapshotName);
+ String snapshotNameBytes = snapshotName;
admin.snapshot(snapshotName, TABLE_NAME);
LOG.info("After snapshot File-System state");
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java
index 2f84c95..e24d445 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java
@@ -186,7 +186,7 @@ public class TestFlushSnapshotFromClient {
// take a snapshot of the enabled table
String snapshotString = "skipFlushTableSnapshot";
- byte[] snapshot = Bytes.toBytes(snapshotString);
+ String snapshot = snapshotString;
admin.snapshot(snapshotString, TABLE_NAME, SnapshotType.SKIPFLUSH);
LOG.debug("Snapshot completed.");
diff --git
a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/client/ThriftAdmin.java
b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/client/ThriftAdmin.java
index 508a623..85adf7d 100644
---
a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/client/ThriftAdmin.java
+++
b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/client/ThriftAdmin.java
@@ -855,11 +855,6 @@ public class ThriftAdmin implements Admin {
}
@Override
- public void deleteSnapshot(byte[] snapshotName) {
- throw new NotImplementedException("deleteSnapshot not supported in
ThriftAdmin");
- }
-
- @Override
public void deleteSnapshot(String snapshotName) {
throw new NotImplementedException("deleteSnapshot not supported in
ThriftAdmin");
}
