diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java index 592a01b6553..c8caa969bbd 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java @@ -87,7 +87,10 @@ public class ClusterStatus extends VersionedWritable { /** * Constructor, for Writable - * @deprecated Used by Writables and Writables are going away. + * @deprecated As of release 0.96 + * (HBASE-6038). + * This will be removed in HBase 2.0.0. + * Used by Writables and Writables are going away. */ @Deprecated public ClusterStatus() { @@ -221,8 +224,12 @@ public class ClusterStatus extends VersionedWritable { * Returns detailed region server information: A list of * {@link ServerName}. * @return region server information - * @deprecated Use {@link #getServers()} + * @deprecated As of release 0.92 + * (HBASE-1502). + * This will be removed in HBase 2.0.0. + * Use {@link #getServers()}. */ + @Deprecated public Collection getServerInfo() { return getServers(); } 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 401e0da575c..596a533a3a8 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 @@ -285,8 +285,11 @@ public class HColumnDescriptor implements WritableComparable private int cachedMaxVersions = UNINITIALIZED; /** - * Default constructor. Must be present for Writable. - * @deprecated Used by Writables and Writables are going away. + * Default constructor. + * @deprecated As of release 0.96 + * (HBASE-5453). + * This will be made private in HBase 2.0.0. + * Used by Writables and Writables are going away. */ @Deprecated // Make this private rather than remove after deprecation period elapses. Its needed by pb @@ -356,7 +359,10 @@ public class HColumnDescriptor implements WritableComparable * other than 'word' characters: i.e. [a-zA-Z_0-9] or contains * a : * @throws IllegalArgumentException if the number of versions is <= 0 - * @deprecated use {@link #HColumnDescriptor(String)} and setters + * @deprecated As of release 0.96 + * (HBASE-). + * This will be removed in HBase 2.0.0. + * Use {@link #HColumnDescriptor(String)} and setters. */ @Deprecated public HColumnDescriptor(final byte [] familyName, final int maxVersions, @@ -388,7 +394,10 @@ public class HColumnDescriptor implements WritableComparable * other than 'word' characters: i.e. [a-zA-Z_0-9] or contains * a : * @throws IllegalArgumentException if the number of versions is <= 0 - * @deprecated use {@link #HColumnDescriptor(String)} and setters + * @deprecated As of release 0.96 + * (HBASE-). + * This will be removed in HBase 2.0.0. + * Use {@link #HColumnDescriptor(String)} and setters. */ @Deprecated public HColumnDescriptor(final byte [] familyName, final int maxVersions, @@ -428,7 +437,10 @@ public class HColumnDescriptor implements WritableComparable * other than 'word' characters: i.e. [a-zA-Z_0-9] or contains * a : * @throws IllegalArgumentException if the number of versions is <= 0 - * @deprecated use {@link #HColumnDescriptor(String)} and setters + * @deprecated As of release 0.96 + * (HBASE-). + * This will be removed in HBase 2.0.0. + * Use {@link #HColumnDescriptor(String)} and setters. */ @Deprecated public HColumnDescriptor(final byte[] familyName, final int minVersions, @@ -670,7 +682,12 @@ public class HColumnDescriptor implements WritableComparable return setValue(COMPRESSION, type.getName().toUpperCase()); } - /** @return data block encoding algorithm used on disk */ + /** + * @return data block encoding algorithm used on disk + * @deprecated As of release 0.98 + * (HBASE-9870). + * This will be removed in HBase 2.0.0. See {@link #getDataBlockEncoding()}} + */ @Deprecated public DataBlockEncoding getDataBlockEncodingOnDisk() { return getDataBlockEncoding(); @@ -680,6 +697,9 @@ public class HColumnDescriptor implements WritableComparable * This method does nothing now. Flag ENCODE_ON_DISK is not used * any more. Data blocks have the same encoding in cache as on disk. * @return this (for chained invocation) + * @deprecated As of release 0.98 + * (HBASE-9870). + * This will be removed in HBase 2.0.0. This method does nothing now. */ @Deprecated public HColumnDescriptor setEncodeOnDisk(boolean encodeOnDisk) { @@ -727,7 +747,9 @@ public class HColumnDescriptor implements WritableComparable /** * @return Whether KV tags should be compressed along with DataBlockEncoding. When no * DataBlockEncoding is been used, this is having no effect. - * @deprecated Use {@link #isCompressTags()} instead + * @deprecated As of release 1.0.0 + * (HBASE-10870). + * This will be removed in HBase 2.0.0. Use {@link #isCompressTags()} instead. */ @Deprecated public boolean shouldCompressTags() { @@ -805,7 +827,10 @@ public class HColumnDescriptor implements WritableComparable * @param keepDeletedCells True if deleted rows should not be collected * immediately. * @return this (for chained invocation) - * @deprecated use {@link #setKeepDeletedCells(KeepDeletedCells)} + * @deprecated As of release 1.0.0 + * (HBASE-12363). + * This will be removed in HBase 2.0.0. + * Use {@link #setKeepDeletedCells(KeepDeletedCells)}. */ @Deprecated public HColumnDescriptor setKeepDeletedCells(boolean keepDeletedCells) { @@ -915,7 +940,9 @@ public class HColumnDescriptor implements WritableComparable /** * @return true if we should cache data blocks on write - * @deprecated Use {@link #isCacheDataOnWrite()} instead + * @deprecated As of release 1.0.0 + * (HBASE-10870). + * This will be removed in HBase 2.0.0. Use {@link #isCacheDataOnWrite()}} instead. */ @Deprecated public boolean shouldCacheDataOnWrite() { @@ -940,7 +967,9 @@ public class HColumnDescriptor implements WritableComparable /** * @return true if we should cache data blocks in the L1 cache (if block cache deploy * has more than one tier; e.g. we are using CombinedBlockCache). - * @deprecated Use {@link #isCacheDataInL1()} instead + * @deprecated As of release 1.0.0 + * (HBASE-10870). + * This will be removed in HBase 2.0.0. Use {@link #isCacheDataInL1()}} instead. */ @Deprecated public boolean shouldCacheDataInL1() { @@ -972,7 +1001,10 @@ public class HColumnDescriptor implements WritableComparable /** * @return true if we should cache index blocks on write - * @deprecated Use {@link #isCacheIndexesOnWrite()} instead + * @deprecated As of release 1.0.0 + * (HBASE-10870). + * This will be removed in HBase 2.0.0. + * Use {@link #isCacheIndexesOnWrite()} instead. */ @Deprecated public boolean shouldCacheIndexesOnWrite() { @@ -996,7 +1028,10 @@ public class HColumnDescriptor implements WritableComparable /** * @return true if we should cache bloomfilter blocks on write - * @deprecated Use {@link #isCacheBloomsOnWrite()} instead + * @deprecated As of release 1.0.0 + * (HBASE-10870). + * This will be removed in HBase 2.0.0. + * Use {@link #isCacheBloomsOnWrite()}} instead. */ @Deprecated public boolean shouldCacheBloomsOnWrite() { @@ -1021,7 +1056,10 @@ public class HColumnDescriptor implements WritableComparable /** * @return true if we should evict cached blocks from the blockcache on * close - * @deprecated {@link #isEvictBlocksOnClose()} instead + * @deprecated As of release 1.0.0 + * (HBASE-10870). + * This will be removed in HBase 2.0.0. + * Use {@link #isEvictBlocksOnClose()}} instead. */ @Deprecated public boolean shouldEvictBlocksOnClose() { @@ -1046,7 +1084,10 @@ public class HColumnDescriptor implements WritableComparable /** * @return true if we should prefetch blocks into the blockcache on open - * @deprecated Use {@link #isPrefetchBlocksOnOpen()} instead + * @deprecated As of release 1.0.0 + * (HBASE-10870). + * This will be removed in HBase 2.0.0. + * Use {@link #isPrefetchBlocksOnOpen()}}} instead. */ @Deprecated public boolean shouldPrefetchBlocksOnOpen() { diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java index a6df9502d03..3c7b2cee075 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java @@ -86,7 +86,8 @@ public class HRegionInfo implements Comparable { * the hbase:meta table. * * Pre-0.92: - * HRI.VERSION == 0 and HConstants.META_VERSION does not exist (is not stored at hbase:meta table) + * HRI.VERSION == 0 and HConstants.META_VERSION does not exist + * (is not stored at hbase:meta table) * HRegionInfo had an HTableDescriptor reference inside it. * HRegionInfo is serialized as Writable to hbase:meta table. * For 0.92.x and 0.94.x: @@ -257,7 +258,10 @@ public class HRegionInfo implements Comparable { } /** Default constructor - creates empty object - * @deprecated Used by Writables and Writables are going away. + * @deprecated As of release 0.96 + * (HBASE-5453). + * This will be removed in HBase 2.0.0. + * Used by Writables and Writables are going away. */ @Deprecated public HRegionInfo() { @@ -509,7 +513,9 @@ public class HRegionInfo implements Comparable { * Gets the table name from the specified region name. * @param regionName * @return Table name. - * @deprecated Since 0.96.0; use #getTable(byte[]) + * @deprecated As of release 0.96 + * (HBASE-9508). + * This will be removed in HBase 2.0.0. Use {@link #getTable(byte[])}. */ @Deprecated public static byte [] getTableName(byte[] regionName) { @@ -676,7 +682,9 @@ public class HRegionInfo implements Comparable { /** * Get current table name of the region * @return byte array of table name - * @deprecated Since 0.96.0; use #getTable() + * @deprecated As of release 0.96 + * (HBASE-9508). + * This will be removed in HBase 2.0.0. Use {@link #getTable()}. */ @Deprecated public byte [] getTableName() { @@ -1264,7 +1272,9 @@ public class HRegionInfo implements Comparable { if (in.markSupported()) { //read it with mark() in.mark(pblen); } - int read = in.read(pbuf); //assumption: if Writable serialization, it should be longer than pblen. + + //assumption: if Writable serialization, it should be longer than pblen. + int read = in.read(pbuf); if (read != pblen) throw new IOException("read=" + read + ", wanted=" + pblen); if (ProtobufUtil.isPBMagicPrefix(pbuf)) { return convert(HBaseProtos.RegionInfo.parseDelimitedFrom(in)); 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 00578dedead..947ac91321a 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 @@ -309,7 +309,10 @@ public class HTableDescriptor implements WritableComparable { /** * Default constructor which constructs an empty object. * For deserializing an HTableDescriptor instance only. - * @deprecated Used by Writables and Writables are going away. + * @deprecated As of release 0.96 + * (HBASE-5453). + * This will be removed in HBase 2.0.0. + * Used by Writables and Writables are going away. */ @Deprecated public HTableDescriptor() { @@ -1107,7 +1110,7 @@ public class HTableDescriptor implements WritableComparable { * This compares the content of the two descriptors and not the reference. * * @return 0 if the contents of the descriptors are exactly matching, - * 1 if there is a mismatch in the contents + * 1 if there is a mismatch in the contents */ @Override public int compareTo(final HTableDescriptor other) { diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java index 8dce8d8fec2..33afce42e9e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java @@ -166,7 +166,9 @@ public class ClientScanner extends AbstractClientScanner { /** * @return Table name - * @deprecated Since 0.96.0; use {@link #getTable()} + * @deprecated As of release 0.96 + * (HBASE-9508). + * This will be removed in HBase 2.0.0. Use {@link #getTable()}. */ @Deprecated protected byte [] getTableName() { diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java index 5b0e685c473..eedd7f691e5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java @@ -1138,7 +1138,10 @@ public class HTable implements HTableInterface { } /** - * @deprecated Use {@link #incrementColumnValue(byte[], byte[], byte[], long, Durability)} + * @deprecated As of release 0.96 + * (HBASE-9508). + * This will be removed in HBase 2.0.0. + * Use {@link #incrementColumnValue(byte[], byte[], byte[], long, Durability)}. */ @Deprecated @Override diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java index 1f4d99afd04..5823f694178 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java @@ -46,7 +46,10 @@ public interface HTableInterface extends Table { byte[] getTableName(); /** - * @deprecated Use {@link #incrementColumnValue(byte[], byte[], byte[], long, Durability)} + * @deprecated As of release 0.96 + * (HBASE-9508). + * This will be removed in HBase 2.0.0. + * Use {@link #incrementColumnValue(byte[], byte[], byte[], long, Durability)}. */ @Deprecated long incrementColumnValue(final byte [] row, final byte [] family, diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java index 303225101fd..827699b9d11 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java @@ -682,7 +682,10 @@ public class LoadIncrementalHFiles extends Configured implements Tool { } /** - * @deprecated Use {@link #tryAtomicRegionLoad(Connection, TableName, byte[], Collection)} + * @deprecated As of release 0.96 + * (HBASE-9508). + * This will be removed in HBase 2.0.0. + * Use {@link #tryAtomicRegionLoad(Connection, TableName, byte[], Collection)}. */ @Deprecated protected List tryAtomicRegionLoad(final HConnection conn, diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java index d30c9488969..090b1a2d1b0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java @@ -91,7 +91,10 @@ implements Writable, Comparable { } /** - * @deprecated Since 0.96.0; use {@link TableSplit#TableSplit(TableName, byte[], byte[], String)} + * @deprecated As of release 0.96 + * (HBASE-9508). + * This will be removed in HBase 2.0.0. + * Use {@link TableSplit#TableSplit(TableName, byte[], byte[], String)}. */ @Deprecated public TableSplit(final byte [] tableName, Scan scan, byte [] startRow, byte [] endRow, @@ -139,7 +142,10 @@ implements Writable, Comparable { } /** - * @deprecated Since 0.96.0; use {@link TableSplit#TableSplit(TableName, byte[], byte[], String)} + * @deprecated As of release 0.96 + * (HBASE-9508). + * This will be removed in HBase 2.0.0. + * Use {@link TableSplit#TableSplit(TableName, byte[], byte[], String)}. */ @Deprecated public TableSplit(final byte [] tableName, byte[] startRow, byte[] endRow,