You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2022/01/19 11:25:43 UTC
[hbase] branch master updated: HBASE-26661 Remove deprecated methods in MasterObserver (#4031)
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 1d2b8a0 HBASE-26661 Remove deprecated methods in MasterObserver (#4031)
1d2b8a0 is described below
commit 1d2b8a033d9b68c8a8b22646b2dadd786bb48fc3
Author: sunyuting1 <49...@users.noreply.github.com>
AuthorDate: Wed Jan 19 19:25:06 2022 +0800
HBASE-26661 Remove deprecated methods in MasterObserver (#4031)
Signrd-off-by: Duo Zhang <zh...@apache.org>
---
.../hadoop/hbase/coprocessor/MasterObserver.java | 95 ++--------------------
1 file changed, 5 insertions(+), 90 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
index 02607b7..076c18a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
@@ -230,25 +230,12 @@ public interface MasterObserver {
* table RPC call.
* @param ctx the environment to interact with the framework and master
* @param tableName the name of the table
- * @param newDescriptor after modify operation, table will have this descriptor
- * @deprecated Since 2.1. Will be removed in 3.0.
- */
- @Deprecated
- default void preModifyTable(final ObserverContext<MasterCoprocessorEnvironment> ctx,
- final TableName tableName, TableDescriptor newDescriptor) throws IOException {}
-
- /**
- * Called prior to modifying a table's properties. Called as part of modify
- * table RPC call.
- * @param ctx the environment to interact with the framework and master
- * @param tableName the name of the table
* @param currentDescriptor current TableDescriptor of the table
* @param newDescriptor after modify operation, table will have this descriptor
*/
default TableDescriptor preModifyTable(final ObserverContext<MasterCoprocessorEnvironment> ctx,
final TableName tableName, TableDescriptor currentDescriptor, TableDescriptor newDescriptor)
throws IOException {
- preModifyTable(ctx, tableName, newDescriptor);
return newDescriptor;
}
@@ -257,41 +244,12 @@ public interface MasterObserver {
* of modify table RPC call.
* @param ctx the environment to interact with the framework and master
* @param tableName the name of the table
- * @param currentDescriptor current TableDescriptor of the table
- * @deprecated Since 2.1. Will be removed in 3.0.
- */
- @Deprecated
- default void postModifyTable(final ObserverContext<MasterCoprocessorEnvironment> ctx,
- final TableName tableName, TableDescriptor currentDescriptor) throws IOException {}
-
- /**
- * Called after the modifyTable operation has been requested. Called as part
- * of modify table RPC call.
- * @param ctx the environment to interact with the framework and master
- * @param tableName the name of the table
* @param oldDescriptor descriptor of table before modify operation happened
* @param currentDescriptor current TableDescriptor of the table
*/
default void postModifyTable(final ObserverContext<MasterCoprocessorEnvironment> ctx,
final TableName tableName, TableDescriptor oldDescriptor, TableDescriptor currentDescriptor)
- throws IOException {
- postModifyTable(ctx, tableName, currentDescriptor);
- }
-
- /**
- * Called prior to modifying a table's properties. Called as part of modify
- * table procedure and it is async to the modify table RPC call.
- *
- * @param ctx the environment to interact with the framework and master
- * @param tableName the name of the table
- * @param newDescriptor after modify operation, table will have this descriptor
- * @deprecated Since 2.1. Will be removed in 3.0.
- */
- @Deprecated
- default void preModifyTableAction(
- final ObserverContext<MasterCoprocessorEnvironment> ctx,
- final TableName tableName,
- final TableDescriptor newDescriptor) throws IOException {}
+ throws IOException {}
/**
* Called prior to modifying a table's properties. Called as part of modify
@@ -306,24 +264,7 @@ public interface MasterObserver {
final ObserverContext<MasterCoprocessorEnvironment> ctx,
final TableName tableName,
final TableDescriptor currentDescriptor,
- final TableDescriptor newDescriptor) throws IOException {
- preModifyTableAction(ctx, tableName, newDescriptor);
- }
-
- /**
- * Called after to modifying a table's properties. Called as part of modify
- * table procedure and it is async to the modify table RPC call.
- *
- * @param ctx the environment to interact with the framework and master
- * @param tableName the name of the table
- * @param currentDescriptor current TableDescriptor of the table
- * @deprecated Since 2.1. Will be removed in 3.0.
- */
- @Deprecated
- default void postCompletedModifyTableAction(
- final ObserverContext<MasterCoprocessorEnvironment> ctx,
- final TableName tableName,
- final TableDescriptor currentDescriptor) throws IOException {}
+ final TableDescriptor newDescriptor) throws IOException {}
/**
* Called after to modifying a table's properties. Called as part of modify
@@ -338,9 +279,7 @@ public interface MasterObserver {
final ObserverContext<MasterCoprocessorEnvironment> ctx,
final TableName tableName,
final TableDescriptor oldDescriptor,
- final TableDescriptor currentDescriptor) throws IOException {
- postCompletedModifyTableAction(ctx, tableName, currentDescriptor);
- }
+ final TableDescriptor currentDescriptor) throws IOException {}
/**
* Called prior to enabling a table. Called as part of enable table RPC call.
@@ -919,34 +858,12 @@ public interface MasterObserver {
/**
* Called prior to modifying a namespace's properties.
* @param ctx the environment to interact with the framework and master
- * @param newNsDescriptor after modify operation, namespace will have this descriptor
- * @deprecated Since 2.1. Will be removed in 3.0.
- */
- @Deprecated
- default void preModifyNamespace(final ObserverContext<MasterCoprocessorEnvironment> ctx,
- NamespaceDescriptor newNsDescriptor) throws IOException {}
-
- /**
- * Called prior to modifying a namespace's properties.
- * @param ctx the environment to interact with the framework and master
* @param currentNsDescriptor current NamespaceDescriptor of the namespace
* @param newNsDescriptor after modify operation, namespace will have this descriptor
*/
default void preModifyNamespace(final ObserverContext<MasterCoprocessorEnvironment> ctx,
NamespaceDescriptor currentNsDescriptor, NamespaceDescriptor newNsDescriptor)
- throws IOException {
- preModifyNamespace(ctx, newNsDescriptor);
- }
-
- /**
- * Called after the modifyNamespace operation has been requested.
- * @param ctx the environment to interact with the framework and master
- * @param currentNsDescriptor current NamespaceDescriptor of the namespace
- * @deprecated Since 2.1. Will be removed in 3.0.
- */
- @Deprecated
- default void postModifyNamespace(final ObserverContext<MasterCoprocessorEnvironment> ctx,
- NamespaceDescriptor currentNsDescriptor) throws IOException {}
+ throws IOException {}
/**
* Called after the modifyNamespace operation has been requested.
@@ -956,9 +873,7 @@ public interface MasterObserver {
*/
default void postModifyNamespace(final ObserverContext<MasterCoprocessorEnvironment> ctx,
NamespaceDescriptor oldNsDescriptor, NamespaceDescriptor currentNsDescriptor)
- throws IOException {
- postModifyNamespace(ctx, currentNsDescriptor);
- }
+ throws IOException {}
/**
* Called before a getNamespaceDescriptor request has been processed.