Skip to content

Commit 1d2b8a0

Browse files
authored
HBASE-26661 Remove deprecated methods in MasterObserver (#4031)
Signrd-off-by: Duo Zhang <zhangduo@apache.org>
1 parent d63ca4f commit 1d2b8a0

File tree

1 file changed

+5
-90
lines changed

1 file changed

+5
-90
lines changed

hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java

Lines changed: 5 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -225,18 +225,6 @@ default void postCompletedTruncateTableAction(
225225
final ObserverContext<MasterCoprocessorEnvironment> ctx, final TableName tableName)
226226
throws IOException {}
227227

228-
/**
229-
* Called prior to modifying a table's properties. Called as part of modify
230-
* table RPC call.
231-
* @param ctx the environment to interact with the framework and master
232-
* @param tableName the name of the table
233-
* @param newDescriptor after modify operation, table will have this descriptor
234-
* @deprecated Since 2.1. Will be removed in 3.0.
235-
*/
236-
@Deprecated
237-
default void preModifyTable(final ObserverContext<MasterCoprocessorEnvironment> ctx,
238-
final TableName tableName, TableDescriptor newDescriptor) throws IOException {}
239-
240228
/**
241229
* Called prior to modifying a table's properties. Called as part of modify
242230
* table RPC call.
@@ -248,22 +236,9 @@ default void preModifyTable(final ObserverContext<MasterCoprocessorEnvironment>
248236
default TableDescriptor preModifyTable(final ObserverContext<MasterCoprocessorEnvironment> ctx,
249237
final TableName tableName, TableDescriptor currentDescriptor, TableDescriptor newDescriptor)
250238
throws IOException {
251-
preModifyTable(ctx, tableName, newDescriptor);
252239
return newDescriptor;
253240
}
254241

255-
/**
256-
* Called after the modifyTable operation has been requested. Called as part
257-
* of modify table RPC call.
258-
* @param ctx the environment to interact with the framework and master
259-
* @param tableName the name of the table
260-
* @param currentDescriptor current TableDescriptor of the table
261-
* @deprecated Since 2.1. Will be removed in 3.0.
262-
*/
263-
@Deprecated
264-
default void postModifyTable(final ObserverContext<MasterCoprocessorEnvironment> ctx,
265-
final TableName tableName, TableDescriptor currentDescriptor) throws IOException {}
266-
267242
/**
268243
* Called after the modifyTable operation has been requested. Called as part
269244
* of modify table RPC call.
@@ -274,24 +249,7 @@ default void postModifyTable(final ObserverContext<MasterCoprocessorEnvironment>
274249
*/
275250
default void postModifyTable(final ObserverContext<MasterCoprocessorEnvironment> ctx,
276251
final TableName tableName, TableDescriptor oldDescriptor, TableDescriptor currentDescriptor)
277-
throws IOException {
278-
postModifyTable(ctx, tableName, currentDescriptor);
279-
}
280-
281-
/**
282-
* Called prior to modifying a table's properties. Called as part of modify
283-
* table procedure and it is async to the modify table RPC call.
284-
*
285-
* @param ctx the environment to interact with the framework and master
286-
* @param tableName the name of the table
287-
* @param newDescriptor after modify operation, table will have this descriptor
288-
* @deprecated Since 2.1. Will be removed in 3.0.
289-
*/
290-
@Deprecated
291-
default void preModifyTableAction(
292-
final ObserverContext<MasterCoprocessorEnvironment> ctx,
293-
final TableName tableName,
294-
final TableDescriptor newDescriptor) throws IOException {}
252+
throws IOException {}
295253

296254
/**
297255
* Called prior to modifying a table's properties. Called as part of modify
@@ -306,24 +264,7 @@ default void preModifyTableAction(
306264
final ObserverContext<MasterCoprocessorEnvironment> ctx,
307265
final TableName tableName,
308266
final TableDescriptor currentDescriptor,
309-
final TableDescriptor newDescriptor) throws IOException {
310-
preModifyTableAction(ctx, tableName, newDescriptor);
311-
}
312-
313-
/**
314-
* Called after to modifying a table's properties. Called as part of modify
315-
* table procedure and it is async to the modify table RPC call.
316-
*
317-
* @param ctx the environment to interact with the framework and master
318-
* @param tableName the name of the table
319-
* @param currentDescriptor current TableDescriptor of the table
320-
* @deprecated Since 2.1. Will be removed in 3.0.
321-
*/
322-
@Deprecated
323-
default void postCompletedModifyTableAction(
324-
final ObserverContext<MasterCoprocessorEnvironment> ctx,
325-
final TableName tableName,
326-
final TableDescriptor currentDescriptor) throws IOException {}
267+
final TableDescriptor newDescriptor) throws IOException {}
327268

328269
/**
329270
* Called after to modifying a table's properties. Called as part of modify
@@ -338,9 +279,7 @@ default void postCompletedModifyTableAction(
338279
final ObserverContext<MasterCoprocessorEnvironment> ctx,
339280
final TableName tableName,
340281
final TableDescriptor oldDescriptor,
341-
final TableDescriptor currentDescriptor) throws IOException {
342-
postCompletedModifyTableAction(ctx, tableName, currentDescriptor);
343-
}
282+
final TableDescriptor currentDescriptor) throws IOException {}
344283

345284
/**
346285
* Called prior to enabling a table. Called as part of enable table RPC call.
@@ -916,16 +855,6 @@ default void preDeleteNamespace(final ObserverContext<MasterCoprocessorEnvironme
916855
default void postDeleteNamespace(final ObserverContext<MasterCoprocessorEnvironment> ctx,
917856
String namespace) throws IOException {}
918857

919-
/**
920-
* Called prior to modifying a namespace's properties.
921-
* @param ctx the environment to interact with the framework and master
922-
* @param newNsDescriptor after modify operation, namespace will have this descriptor
923-
* @deprecated Since 2.1. Will be removed in 3.0.
924-
*/
925-
@Deprecated
926-
default void preModifyNamespace(final ObserverContext<MasterCoprocessorEnvironment> ctx,
927-
NamespaceDescriptor newNsDescriptor) throws IOException {}
928-
929858
/**
930859
* Called prior to modifying a namespace's properties.
931860
* @param ctx the environment to interact with the framework and master
@@ -934,19 +863,7 @@ default void preModifyNamespace(final ObserverContext<MasterCoprocessorEnvironme
934863
*/
935864
default void preModifyNamespace(final ObserverContext<MasterCoprocessorEnvironment> ctx,
936865
NamespaceDescriptor currentNsDescriptor, NamespaceDescriptor newNsDescriptor)
937-
throws IOException {
938-
preModifyNamespace(ctx, newNsDescriptor);
939-
}
940-
941-
/**
942-
* Called after the modifyNamespace operation has been requested.
943-
* @param ctx the environment to interact with the framework and master
944-
* @param currentNsDescriptor current NamespaceDescriptor of the namespace
945-
* @deprecated Since 2.1. Will be removed in 3.0.
946-
*/
947-
@Deprecated
948-
default void postModifyNamespace(final ObserverContext<MasterCoprocessorEnvironment> ctx,
949-
NamespaceDescriptor currentNsDescriptor) throws IOException {}
866+
throws IOException {}
950867

951868
/**
952869
* Called after the modifyNamespace operation has been requested.
@@ -956,9 +873,7 @@ default void postModifyNamespace(final ObserverContext<MasterCoprocessorEnvironm
956873
*/
957874
default void postModifyNamespace(final ObserverContext<MasterCoprocessorEnvironment> ctx,
958875
NamespaceDescriptor oldNsDescriptor, NamespaceDescriptor currentNsDescriptor)
959-
throws IOException {
960-
postModifyNamespace(ctx, currentNsDescriptor);
961-
}
876+
throws IOException {}
962877

963878
/**
964879
* Called before a getNamespaceDescriptor request has been processed.

0 commit comments

Comments
 (0)