diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java index 9bb5df4fb6..f6c79ac085 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java @@ -727,7 +727,7 @@ public interface Admin extends Abortable, Closeable { * @param columnFamily column family descriptor of column family to be added * @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; /** @@ -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 * wait on the operation to complete. */ - Future addColumnFamilyAsync(final TableName tableName, final HColumnDescriptor columnFamily) + Future addColumnFamilyAsync(final TableName tableName, final ColumnFamilyDescriptor columnFamily) throws IOException; /** @@ -807,7 +807,7 @@ public interface Admin extends Abortable, Closeable { * @param columnFamily new column family descriptor to use * @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; /** @@ -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 * wait on the operation to complete. */ - Future modifyColumnFamilyAsync(TableName tableName, HColumnDescriptor columnFamily) + Future modifyColumnFamilyAsync(TableName tableName, ColumnFamilyDescriptor columnFamily) throws IOException; diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java index fb9df62faf..5970aef147 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java @@ -1010,14 +1010,14 @@ public class HBaseAdmin implements Admin { } @Override - public void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily) + public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) throws IOException { get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); } @Override public Future addColumnFamilyAsync(final TableName tableName, - final HColumnDescriptor columnFamily) throws IOException { + final ColumnFamilyDescriptor columnFamily) throws IOException { AddColumnResponse response = executeCallable(new MasterCallable(getConnection(), getRpcControllerFactory()) { @@ -1109,13 +1109,13 @@ public class HBaseAdmin implements Admin { @Override public void modifyColumnFamily(final TableName tableName, - final HColumnDescriptor columnFamily) throws IOException { + final ColumnFamilyDescriptor columnFamily) throws IOException { get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); } @Override public Future modifyColumnFamilyAsync(final TableName tableName, - final HColumnDescriptor columnFamily) throws IOException { + final ColumnFamilyDescriptor columnFamily) throws IOException { ModifyColumnResponse response = executeCallable(new MasterCallable(getConnection(), getRpcControllerFactory()) {