Repository: hbase Updated Branches: refs/heads/branch-1 09d451b1d -> b9df7978f
HBASE-15608 Remove PB references from SnapShot related Exceptions (Ram) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b9df7978 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b9df7978 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b9df7978 Branch: refs/heads/branch-1 Commit: b9df7978fc6f0d947996f607db842a3393b04292 Parents: 09d451b Author: Ramkrishna <[email protected]> Authored: Fri May 6 17:07:44 2016 +0530 Committer: Ramkrishna <[email protected]> Committed: Fri May 6 17:07:44 2016 +0530 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/client/Admin.java | 1 + .../apache/hadoop/hbase/snapshot/CorruptedSnapshotException.java | 1 + .../org/apache/hadoop/hbase/snapshot/HBaseSnapshotException.java | 3 +++ .../apache/hadoop/hbase/snapshot/RestoreSnapshotException.java | 2 ++ .../apache/hadoop/hbase/snapshot/SnapshotCreationException.java | 1 + .../hadoop/hbase/snapshot/SnapshotDoesNotExistException.java | 1 + .../org/apache/hadoop/hbase/snapshot/SnapshotExistsException.java | 1 + 7 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b9df7978/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java ---------------------------------------------------------------------- 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 c8b91a9..7b1d016 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 @@ -1526,6 +1526,7 @@ public interface Admin extends Abortable, Closeable { * */ void releaseSplitOrMergeLockAndRollback() throws IOException; + @Deprecated @InterfaceAudience.Public @InterfaceStability.Evolving public enum MasterSwitchType { http://git-wip-us.apache.org/repos/asf/hbase/blob/b9df7978/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/CorruptedSnapshotException.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/CorruptedSnapshotException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/CorruptedSnapshotException.java index 2c6cc35..d29c89c 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/CorruptedSnapshotException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/CorruptedSnapshotException.java @@ -43,6 +43,7 @@ public class CorruptedSnapshotException extends HBaseSnapshotException { * @param message full description of the failure * @param snapshot snapshot that was expected */ + @Deprecated public CorruptedSnapshotException(String message, SnapshotDescription snapshot) { super(message, snapshot); } http://git-wip-us.apache.org/repos/asf/hbase/blob/b9df7978/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/HBaseSnapshotException.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/HBaseSnapshotException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/HBaseSnapshotException.java index 4a28461..cd2f66f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/HBaseSnapshotException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/HBaseSnapshotException.java @@ -45,6 +45,7 @@ public class HBaseSnapshotException extends DoNotRetryIOException { * @param msg reason why the snapshot failed * @param desc description of the snapshot that is being failed */ + @Deprecated public HBaseSnapshotException(String msg, SnapshotDescription desc) { super(msg); this.description = desc; @@ -56,6 +57,7 @@ public class HBaseSnapshotException extends DoNotRetryIOException { * @param cause root cause of the failure * @param desc description of the snapshot that is being failed */ + @Deprecated public HBaseSnapshotException(String msg, Throwable cause, SnapshotDescription desc) { super(msg, cause); this.description = desc; @@ -71,6 +73,7 @@ public class HBaseSnapshotException extends DoNotRetryIOException { super(message, e); } + @Deprecated public SnapshotDescription getSnapshotDescription() { return this.description; } http://git-wip-us.apache.org/repos/asf/hbase/blob/b9df7978/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotException.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotException.java index c36d482..25cd583 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotException.java @@ -29,10 +29,12 @@ import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptio @InterfaceAudience.Public @InterfaceStability.Evolving public class RestoreSnapshotException extends HBaseSnapshotException { + @Deprecated public RestoreSnapshotException(String msg, SnapshotDescription desc) { super(msg, desc); } + @Deprecated public RestoreSnapshotException(String msg, Throwable cause, SnapshotDescription desc) { super(msg, cause, desc); } http://git-wip-us.apache.org/repos/asf/hbase/blob/b9df7978/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotCreationException.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotCreationException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotCreationException.java index 2f7d2be..324d41f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotCreationException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotCreationException.java @@ -53,6 +53,7 @@ public class SnapshotCreationException extends HBaseSnapshotException { * @param cause root cause of the failure * @param desc description of the snapshot attempted */ + @Deprecated public SnapshotCreationException(String msg, Throwable cause, SnapshotDescription desc) { super(msg, cause, desc); } http://git-wip-us.apache.org/repos/asf/hbase/blob/b9df7978/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotDoesNotExistException.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotDoesNotExistException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotDoesNotExistException.java index d9ecd14..6ba45bd 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotDoesNotExistException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotDoesNotExistException.java @@ -39,6 +39,7 @@ public class SnapshotDoesNotExistException extends HBaseSnapshotException { /** * @param desc expected snapshot to find */ + @Deprecated public SnapshotDoesNotExistException(SnapshotDescription desc) { super("Snapshot '" + desc.getName() +"' doesn't exist on the filesystem", desc); } http://git-wip-us.apache.org/repos/asf/hbase/blob/b9df7978/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotExistsException.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotExistsException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotExistsException.java index 172c89e..ff3cdcb 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotExistsException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotExistsException.java @@ -37,6 +37,7 @@ public class SnapshotExistsException extends HBaseSnapshotException { * @param msg full description of the failure * @param desc snapshot that was attempted */ + @Deprecated public SnapshotExistsException(String msg, SnapshotDescription desc) { super(msg, desc); }
