Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-18420 Some methods of Admin don't use ColumnFamilyDescriptor

This commit is contained in:
Chia-Ping Tsai 2017-07-21 19:15:09 +08:00
parent b81fed7f88
commit f8fa04c717
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java
View File

@ -714,7 +714,7 @@ public interface Admin extends Abortable, Closeable {
* @deprecated As of release 2.0.0. * @deprecated As of release 2.0.0.
* (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>). * (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>).
* This will be removed in HBase 3.0.0. * This will be removed in HBase 3.0.0.
* Use {@link #addColumnFamily(TableName, HColumnDescriptor)}. * Use {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)}.
*/ */
@Deprecated @Deprecated
void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) void addColumn(final TableName tableName, final HColumnDescriptor columnFamily)
@ -727,7 +727,7 @@ public interface Admin extends Abortable, Closeable {
* @param columnFamily column family descriptor of column family to be added * @param columnFamily column family descriptor of column family to be added
* @throws IOException if a remote or network exception occurs * @throws IOException if a remote or network exception occurs
*/ */
void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily) void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)
throws IOException; throws IOException;
/** /**
@ -743,7 +743,7 @@ public interface Admin extends Abortable, Closeable {
* @return the result of the async add column family. You can use Future.get(long, TimeUnit) to * @return the result of the async add column family. You can use Future.get(long, TimeUnit) to
* wait on the operation to complete. * wait on the operation to complete.
*/ */
Future<Void> addColumnFamilyAsync(final TableName tableName, final HColumnDescriptor columnFamily) Future<Void> addColumnFamilyAsync(final TableName tableName, final ColumnFamilyDescriptor columnFamily)
throws IOException; throws IOException;
/** /**
@ -794,7 +794,7 @@ public interface Admin extends Abortable, Closeable {
* @deprecated As of release 2.0.0. * @deprecated As of release 2.0.0.
* (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>). * (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>).
* This will be removed in HBase 3.0.0. * This will be removed in HBase 3.0.0.
* Use {@link #modifyColumnFamily(TableName, HColumnDescriptor)}. * Use {@link #modifyColumnFamily(TableName, ColumnFamilyDescriptor)}.
*/ */
@Deprecated @Deprecated
void modifyColumn(final TableName tableName, final HColumnDescriptor columnFamily) void modifyColumn(final TableName tableName, final HColumnDescriptor columnFamily)
@ -807,7 +807,7 @@ public interface Admin extends Abortable, Closeable {
* @param columnFamily new column family descriptor to use * @param columnFamily new column family descriptor to use
* @throws IOException if a remote or network exception occurs * @throws IOException if a remote or network exception occurs
*/ */
void modifyColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily) void modifyColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)
throws IOException; throws IOException;
/** /**
@ -823,7 +823,7 @@ public interface Admin extends Abortable, Closeable {
* @return the result of the async modify column family. You can use Future.get(long, TimeUnit) to * @return the result of the async modify column family. You can use Future.get(long, TimeUnit) to
* wait on the operation to complete. * wait on the operation to complete.
*/ */
Future<Void> modifyColumnFamilyAsync(TableName tableName, HColumnDescriptor columnFamily) Future<Void> modifyColumnFamilyAsync(TableName tableName, ColumnFamilyDescriptor columnFamily)
throws IOException; throws IOException;

12
hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
View File

@ -1000,7 +1000,7 @@ public class HBaseAdmin implements Admin {
/** /**
* {@inheritDoc} * {@inheritDoc}
* @deprecated Since 2.0. Will be removed in 3.0. Use * @deprecated Since 2.0. Will be removed in 3.0. Use
* {@link #addColumnFamily(TableName, HColumnDescriptor)} instead. * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.
*/ */
@Override @Override
@Deprecated @Deprecated
@ -1010,14 +1010,14 @@ public class HBaseAdmin implements Admin {
} }
@Override @Override
public void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily) public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)
throws IOException { throws IOException {
get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);
} }
@Override @Override
public Future<Void> addColumnFamilyAsync(final TableName tableName, public Future<Void> addColumnFamilyAsync(final TableName tableName,
final HColumnDescriptor columnFamily) throws IOException { final ColumnFamilyDescriptor columnFamily) throws IOException {
AddColumnResponse response = AddColumnResponse response =
executeCallable(new MasterCallable<AddColumnResponse>(getConnection(), executeCallable(new MasterCallable<AddColumnResponse>(getConnection(),
getRpcControllerFactory()) { getRpcControllerFactory()) {
@ -1098,7 +1098,7 @@ public class HBaseAdmin implements Admin {
/** /**
* {@inheritDoc} * {@inheritDoc}
* @deprecated As of 2.0. Will be removed in 3.0. Use * @deprecated As of 2.0. Will be removed in 3.0. Use
* {@link #modifyColumnFamily(TableName, HColumnDescriptor)} instead. * {@link #modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.
*/ */
@Override @Override
@Deprecated @Deprecated
@ -1109,13 +1109,13 @@ public class HBaseAdmin implements Admin {
@Override @Override
public void modifyColumnFamily(final TableName tableName, public void modifyColumnFamily(final TableName tableName,
final HColumnDescriptor columnFamily) throws IOException { final ColumnFamilyDescriptor columnFamily) throws IOException {
get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);
} }
@Override @Override
public Future<Void> modifyColumnFamilyAsync(final TableName tableName, public Future<Void> modifyColumnFamilyAsync(final TableName tableName,
final HColumnDescriptor columnFamily) throws IOException { final ColumnFamilyDescriptor columnFamily) throws IOException {
ModifyColumnResponse response = ModifyColumnResponse response =
executeCallable(new MasterCallable<ModifyColumnResponse>(getConnection(), executeCallable(new MasterCallable<ModifyColumnResponse>(getConnection(),
getRpcControllerFactory()) { getRpcControllerFactory()) {