From 9de5fd5bb56482f82a86eaa8068b5206174115f6 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Tue, 15 Aug 2017 09:36:51 +0200 Subject: [PATCH] HBASE-18599 Add missing @Deprecated annotations Signed-off-by: Michael Stack --- .../hadoop/hbase/HColumnDescriptor.java | 17 ++++++++-- .../apache/hadoop/hbase/HTableDescriptor.java | 8 +++-- .../org/apache/hadoop/hbase/client/Admin.java | 32 ++++++++++++++----- .../hadoop/hbase/client/AsyncAdmin.java | 5 ++- .../client/metrics/ServerSideScanMetrics.java | 15 +++++++-- .../hbase/coprocessor/RegionObserver.java | 5 ++- 6 files changed, 65 insertions(+), 17 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java index 5fe85ccc479..507bf49868e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java @@ -100,14 +100,18 @@ public class HColumnDescriptor implements ColumnFamilyDescriptor, Comparable: - * @deprecated use {@link ColumnFamilyDescriptorBuilder#of(String)} + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-18433). + * Use {@link ColumnFamilyDescriptorBuilder#of(String)}. */ + @Deprecated public HColumnDescriptor(final String familyName) { this(Bytes.toBytes(familyName)); } @@ -118,8 +122,11 @@ public class HColumnDescriptor implements ColumnFamilyDescriptor, Comparable: - * @deprecated use {@link ColumnFamilyDescriptorBuilder#of(byte[])} + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-18433). + * Use {@link ColumnFamilyDescriptorBuilder#of(byte[])}. */ + @Deprecated public HColumnDescriptor(final byte [] familyName) { this(new ModifyableColumnFamilyDescriptor(familyName)); } @@ -128,9 +135,13 @@ public class HColumnDescriptor implements ColumnFamilyDescriptor, ComparableHBASE-18433). + * Use {@link ColumnFamilyDescriptorBuilder#copy(ColumnFamilyDescriptor)}. */ + @Deprecated public HColumnDescriptor(HColumnDescriptor desc) { this(desc, true); } diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java index c09d434f3dd..a0f23c118f3 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java @@ -44,7 +44,7 @@ import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder.ModifyableCo * if the table is read only, the maximum size of the memstore, * when the region split should occur, coprocessors associated with it etc... * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0. - * use {@link TableDescriptorBuilder} to build {@link HTableDescriptor}. + * Use {@link TableDescriptorBuilder} to build {@link HTableDescriptor}. */ @Deprecated @InterfaceAudience.Public @@ -602,9 +602,13 @@ public class HTableDescriptor implements TableDescriptor, ComparableHBASE-18008). + * Use {@link #getColumnFamilyNames()}. */ + @Deprecated public Set getFamiliesKeys() { return delegatee.getColumnFamilyNames(); } 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 d2acae3befe..8de9f89fd11 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 @@ -833,8 +833,11 @@ public interface Admin extends Abortable, Closeable { * @param regionname region name to close * @param serverName Deprecated. Not used. * @throws IOException if a remote or network exception occurs - * @deprecated Since 2.0. Will be removed in 3.0. Use {@link #unassign(byte[], boolean)} instead. + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-18231). + * Use {@link #unassign(byte[], boolean)}. */ + @Deprecated void closeRegion(final String regionname, final String serverName) throws IOException; /** @@ -843,8 +846,11 @@ public interface Admin extends Abortable, Closeable { * @param regionname region name to close * @param serverName Deprecated. Not used. * @throws IOException if a remote or network exception occurs - * @deprecated Since 2.0. Will be removed in 3.0. Use {@link #unassign(byte[], boolean)} instead. + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-18231). + * Use {@link #unassign(byte[], boolean)}. */ + @Deprecated void closeRegion(final byte[] regionname, final String serverName) throws IOException; /** @@ -857,8 +863,11 @@ public interface Admin extends Abortable, Closeable { * @param serverName Deprecated. Not used. * @return Deprecated. Returns true always. * @throws IOException if a remote or network exception occurs - * @deprecated Since 2.0. Will be removed in 3.0. Use {@link #unassign(byte[], boolean)} instead. + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-18231). + * Use {@link #unassign(byte[], boolean)}. */ + @Deprecated boolean closeRegionWithEncodedRegionName(final String encodedRegionName, final String serverName) throws IOException; @@ -866,8 +875,11 @@ public interface Admin extends Abortable, Closeable { * Used {@link #unassign(byte[], boolean)} to unassign the region. For expert-admins. * * @param sn Deprecated. Not used. - * @deprecated Since 2.0. Will be removed in 3.0. Use {@link #unassign(byte[], boolean)} instead. + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-18231). + * Use {@link #unassign(byte[], boolean)}. */ + @Deprecated void closeRegion(final ServerName sn, final HRegionInfo hri) throws IOException; /** @@ -1175,9 +1187,11 @@ public interface Admin extends Abortable, Closeable { * * @param regionName region to split * @throws IOException if a remote or network exception occurs - * @deprecated Since 2.0. Will be removed in 3.0. Use - * {@link #splitRegionAsync(byte[], byte[])} instead. + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-18229). + * Use {@link #splitRegionAsync(byte[], byte[])}. */ + @Deprecated void splitRegion(final byte[] regionName) throws IOException; /** @@ -1196,9 +1210,11 @@ public interface Admin extends Abortable, Closeable { * @param regionName region to split * @param splitPoint the explicit position to split on * @throws IOException if a remote or network exception occurs - * @deprecated Since 2.0. Will be removed in 3.0. Use - * {@link #splitRegionAsync(byte[], byte[])} instead. + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-18229). + * Use {@link #splitRegionAsync(byte[], byte[])}. */ + @Deprecated void splitRegion(final byte[] regionName, final byte[] splitPoint) throws IOException; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdmin.java index f2f2bf1c75b..4b3381247c8 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdmin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdmin.java @@ -296,8 +296,11 @@ public interface AsyncAdmin { * @param regionName region name to close * @param serverName Deprecated. Not used anymore after deprecation. * @return Deprecated. Always returns true now. - * @deprecated Since 2.0. Will be removed in 3.0. Use {@link #unassign(byte[], boolean)} instead. + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-18231). + * Use {@link #unassign(byte[], boolean)}. */ + @Deprecated CompletableFuture closeRegion(byte[] regionName, Optional serverName); /** diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.java index 2f73a0eb4d2..33d12785d72 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/metrics/ServerSideScanMetrics.java @@ -49,9 +49,20 @@ public class ServerSideScanMetrics { public static final String COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME = "ROWS_SCANNED"; public static final String COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME = "ROWS_FILTERED"; - /** @deprecated Use {@link #COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME} instead */ + /** + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-17886). + * Use {@link #COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME}. + */ + @Deprecated public static final String COUNT_OF_ROWS_SCANNED_KEY = COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME; - /** @deprecated Use {@link #COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME} instead */ + + /** + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-17886). + * Use {@link #COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME}. + */ + @Deprecated public static final String COUNT_OF_ROWS_FILTERED_KEY = COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME; /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionObserver.java index da78a098905..4f997c21cfe 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionObserver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionObserver.java @@ -1437,8 +1437,11 @@ public interface RegionObserver extends Coprocessor { * @param stagingFamilyPaths pairs of { CF, HFile path } submitted for bulk load * @param hasLoaded whether the bulkLoad was successful * @return the new value of hasLoaded - * @deprecated Use {@link #postBulkLoadHFile(ObserverContext, List, Map, boolean)} + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-17123). + * Use {@link #postBulkLoadHFile(ObserverContext, List, Map, boolean)}. */ + @Deprecated default boolean postBulkLoadHFile(final ObserverContext ctx, List> stagingFamilyPaths, boolean hasLoaded) throws IOException { return hasLoaded;