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 592a01b..8bb3562 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,8 @@ 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,7 +222,8 @@ 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()}
*/
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 401e0da..07fd2e3 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,9 @@ 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 +357,8 @@ 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 +390,8 @@ 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 +431,8 @@ 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 +674,11 @@ 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 +688,8 @@ 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 +737,8 @@ 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 +816,8 @@ 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 +927,8 @@ 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 +953,8 @@ 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 +986,8 @@ 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 +1011,8 @@ 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 +1037,8 @@ 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 +1063,8 @@ 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 a6df950..ca5c422 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
@@ -257,7 +257,8 @@ 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 +510,8 @@ 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 +678,8 @@ 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() {
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 00578de..cb68846 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,8 @@ 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() {
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 0c28e05..c2267bb 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,8 @@ 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 e8518bd..b129dc3 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
@@ -1134,7 +1134,9 @@ 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 1f4d99a..1696cad 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,9 @@ 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 3032251..4a273f1 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,9 @@ 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 d30c948..cd818cf 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,9 @@ 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 +141,9 @@ 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,