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

Revert "Rename & deprecate everything in Admin" 

Revert because does not cite associated JIRA in commit message (my
fault)

This reverts commit 2ad4114149.
This commit is contained in:
stack 2015-05-11 09:41:40 -07:00
parent 211786e00c
commit b03ff8ccca
18 changed files with 100 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -489,79 +489,33 @@ public interface Admin extends Abortable, Closeable {
Pair<Integer, Integer> getAlterStatus(final byte[] tableName) throws IOException; Pair<Integer, Integer> getAlterStatus(final byte[] tableName) throws IOException;
/** /**
* Add a column family to an existing table. Asynchronous operation. * Add a column to an existing table. Asynchronous operation.
* *
* @param tableName name of the table to add column family to * @param tableName name of the table to add column to
* @param columnFamily column family descriptor of column family to be added * @param column column descriptor of column to be added
* @throws IOException if a remote or network exception occurs
* @deprecated As of release 2.0.0.
* (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>).
* This will be removed in HBase 3.0.0.
* Use {@link #addColumnFamily(TableName, HColumnDescriptor)}.
*/
@Deprecated
void addColumn(final TableName tableName, final HColumnDescriptor columnFamily)
throws IOException;
/**
* Add a column family to an existing table. Asynchronous operation.
*
* @param tableName name of the table to add column family to
* @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 addColumn(final TableName tableName, final HColumnDescriptor column) throws IOException;
throws IOException;
/** /**
* Delete a column family from a table. Asynchronous operation. * Delete a column from a table. Asynchronous operation.
* *
* @param tableName name of table * @param tableName name of table
* @param columnFamily name of column family to be deleted * @param columnName name of column to be deleted
* @throws IOException if a remote or network exception occurs
* @deprecated As of release 2.0.0.
* (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>).
* This will be removed in HBase 3.0.0.
* Use {@link #deleteColumnFamily(TableName, byte[])}}.
*/
@Deprecated
void deleteColumn(final TableName tableName, final byte[] columnFamily) throws IOException;
/**
* Delete a column family from a table. Asynchronous operation.
*
* @param tableName name of table
* @param columnFamily name of column family to be deleted
* @throws IOException if a remote or network exception occurs * @throws IOException if a remote or network exception occurs
*/ */
void deleteColumnFamily(final TableName tableName, final byte[] columnFamily) throws IOException; void deleteColumn(final TableName tableName, final byte[] columnName) throws IOException;
/** /**
* Modify an existing column family on a table. Asynchronous operation. * Modify an existing column family on a table. Asynchronous operation.
* *
* @param tableName name of table * @param tableName name of table
* @param columnFamily new column family descriptor to use * @param descriptor new column descriptor to use
* @throws IOException if a remote or network exception occurs
* @deprecated As of release 2.0.0.
* (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>).
* This will be removed in HBase 3.0.0.
* Use {@link #modifyColumnFamily(TableName, HColumnDescriptor)}.
*/
@Deprecated
void modifyColumn(final TableName tableName, final HColumnDescriptor columnFamily)
throws IOException;
/**
* Modify an existing column family on a table. Asynchronous operation.
*
* @param tableName name of table
* @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 modifyColumn(final TableName tableName, final HColumnDescriptor descriptor)
throws IOException; throws IOException;
/** /**
* Close a region. For expert-admins. Runs close on the regionserver. The master will not be * Close a region. For expert-admins. Runs close on the regionserver. The master will not be
* informed of the close. * informed of the close.

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

@ -1349,137 +1349,95 @@ public class HBaseAdmin implements Admin {
} }
/** /**
* Add a column family to an existing table. * Add a column to an existing table.
* Asynchronous operation. * Asynchronous operation.
* *
* @param tableName name of the table to add column family to * @param tableName name of the table to add column to
* @param columnFamily column family descriptor of column family to be added * @param column column descriptor of column to be added
* @throws IOException if a remote or network exception occurs * @throws IOException if a remote or network exception occurs
* @deprecated As of release 2.0.0.
* (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>).
* This will be removed in HBase 3.0.0.
* Use {@link #addColumnFamily(TableName, HColumnDescriptor)}.
*/ */
@Deprecated public void addColumn(final byte[] tableName, HColumnDescriptor column)
public void addColumn(final byte[] tableName, HColumnDescriptor columnFamily)
throws IOException { throws IOException {
addColumnFamily(TableName.valueOf(tableName), columnFamily); addColumn(TableName.valueOf(tableName), column);
}
/**
* Add a column to an existing table.
* Asynchronous operation.
*
* @param tableName name of the table to add column to
* @param column column descriptor of column to be added
* @throws IOException if a remote or network exception occurs
*/
public void addColumn(final String tableName, HColumnDescriptor column)
throws IOException {
addColumn(TableName.valueOf(tableName), column);
} }
/** /**
* Add a column family to an existing table. * Add a column to an existing table.
* Asynchronous operation. * Asynchronous operation.
* *
* @param tableName name of the table to add column family to * @param tableName name of the table to add column to
* @param columnFamily column family descriptor of column family to be added * @param column column descriptor of column to be added
* @throws IOException if a remote or network exception occurs * @throws IOException if a remote or network exception occurs
* @deprecated As of release 2.0.0.
* (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>).
* This will be removed in HBase 3.0.0.
* Use {@link #addColumnFamily(TableName, HColumnDescriptor)}.
*/
@Deprecated
public void addColumn(final String tableName, HColumnDescriptor columnFamily)
throws IOException {
addColumnFamily(TableName.valueOf(tableName), columnFamily);
}
/**
* Add a column family to an existing table.
* Asynchronous operation.
*
* @param tableName name of the table to add column family to
* @param columnFamily column family descriptor of column family to be added
* @throws IOException if a remote or network exception occurs
* @deprecated As of release 2.0.0.
* (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>).
* This will be removed in HBase 3.0.0.
* Use {@link #addColumnFamily(TableName, HColumnDescriptor)}.
*/ */
@Override @Override
@Deprecated public void addColumn(final TableName tableName, final HColumnDescriptor column)
public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily)
throws IOException {
addColumnFamily(tableName, columnFamily);
}
@Override
public void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily)
throws IOException { throws IOException {
executeCallable(new MasterCallable<Void>(getConnection()) { executeCallable(new MasterCallable<Void>(getConnection()) {
@Override @Override
public Void call(int callTimeout) throws ServiceException { public Void call(int callTimeout) throws ServiceException {
AddColumnRequest req = RequestConverter.buildAddColumnRequest(tableName, columnFamily); AddColumnRequest req = RequestConverter.buildAddColumnRequest(tableName, column);
master.addColumn(null, req); master.addColumn(null,req);
return null; return null;
} }
}); });
} }
/** /**
* Delete a column family from a table. * Delete a column from a table.
* Asynchronous operation. * Asynchronous operation.
* *
* @param tableName name of table * @param tableName name of table
* @param columnFamily name of column family to be deleted * @param columnName name of column to be deleted
* @throws IOException if a remote or network exception occurs * @throws IOException if a remote or network exception occurs
* @deprecated As of release 2.0.0.
* (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>).
* This will be removed in HBase 3.0.0.
* Use {@link #deleteColumnFamily(TableName, byte[])}.
*/ */
@Deprecated public void deleteColumn(final byte[] tableName, final String columnName)
public void deleteColumn(final byte[] tableName, final String columnFamily)
throws IOException { throws IOException {
deleteColumnFamily(TableName.valueOf(tableName), Bytes.toBytes(columnFamily)); deleteColumn(TableName.valueOf(tableName), Bytes.toBytes(columnName));
} }
/** /**
* Delete a column family from a table. * Delete a column from a table.
* Asynchronous operation. * Asynchronous operation.
* *
* @param tableName name of table * @param tableName name of table
* @param columnFamily name of column family to be deleted * @param columnName name of column to be deleted
* @throws IOException if a remote or network exception occurs * @throws IOException if a remote or network exception occurs
* @deprecated As of release 2.0.0.
* (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>).
* This will be removed in HBase 3.0.0.
* Use {@link #deleteColumnFamily(TableName, byte[])}.
*/ */
@Deprecated public void deleteColumn(final String tableName, final String columnName)
public void deleteColumn(final String tableName, final String columnFamily)
throws IOException { throws IOException {
deleteColumnFamily(TableName.valueOf(tableName), Bytes.toBytes(columnFamily)); deleteColumn(TableName.valueOf(tableName), Bytes.toBytes(columnName));
} }
/** /**
* Delete a column family from a table. * Delete a column from a table.
* Asynchronous operation. * Asynchronous operation.
* *
* @param tableName name of table * @param tableName name of table
* @param columnFamily name of column family to be deleted * @param columnName name of column to be deleted
* @throws IOException if a remote or network exception occurs * @throws IOException if a remote or network exception occurs
* @deprecated As of release 2.0.0.
* (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>).
* This will be removed in HBase 3.0.0.
* Use {@link #deleteColumnFamily(TableName, byte[])}.
*/ */
@Override @Override
@Deprecated public void deleteColumn(final TableName tableName, final byte [] columnName)
public void deleteColumn(final TableName tableName, final byte[] columnFamily)
throws IOException {
deleteColumnFamily(tableName, columnFamily);
}
@Override
public void deleteColumnFamily(final TableName tableName, final byte[] columnFamily)
throws IOException { throws IOException {
executeCallable(new MasterCallable<Void>(getConnection()) { executeCallable(new MasterCallable<Void>(getConnection()) {
@Override @Override
public Void call(int callTimeout) throws ServiceException { public Void call(int callTimeout) throws ServiceException {
DeleteColumnRequest req = DeleteColumnRequest req = RequestConverter.buildDeleteColumnRequest(tableName, columnName);
RequestConverter.buildDeleteColumnRequest(tableName, columnFamily); master.deleteColumn(null,req);
master.deleteColumn(null, req);
return null; return null;
} }
}); });
@ -1490,17 +1448,12 @@ public class HBaseAdmin implements Admin {
* Asynchronous operation. * Asynchronous operation.
* *
* @param tableName name of table * @param tableName name of table
* @param columnFamily new column family descriptor to use * @param descriptor new column descriptor to use
* @throws IOException if a remote or network exception occurs * @throws IOException if a remote or network exception occurs
* @deprecated As of release 2.0.0.
* (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>).
* This will be removed in HBase 3.0.0.
* Use {@link #modifyColumnFamily(TableName, HColumnDescriptor)}.
*/ */
@Deprecated public void modifyColumn(final String tableName, HColumnDescriptor descriptor)
public void modifyColumn(final String tableName, HColumnDescriptor columnFamily)
throws IOException { throws IOException {
modifyColumnFamily(TableName.valueOf(tableName), columnFamily); modifyColumn(TableName.valueOf(tableName), descriptor);
} }
/** /**
@ -1508,46 +1461,31 @@ public class HBaseAdmin implements Admin {
* Asynchronous operation. * Asynchronous operation.
* *
* @param tableName name of table * @param tableName name of table
* @param columnFamily new column family descriptor to use * @param descriptor new column descriptor to use
* @throws IOException if a remote or network exception occurs * @throws IOException if a remote or network exception occurs
* @deprecated As of release 2.0.0.
* (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>).
* This will be removed in HBase 3.0.0.
* Use {@link #modifyColumnFamily(TableName, HColumnDescriptor)}.
*/ */
@Deprecated public void modifyColumn(final byte[] tableName, HColumnDescriptor descriptor)
public void modifyColumn(final byte[] tableName, HColumnDescriptor columnFamily)
throws IOException { throws IOException {
modifyColumnFamily(TableName.valueOf(tableName), columnFamily); modifyColumn(TableName.valueOf(tableName), descriptor);
} }
/** /**
* Modify an existing column family on a table. * Modify an existing column family on a table.
* Asynchronous operation. * Asynchronous operation.
* *
* @param tableName name of table * @param tableName name of table
* @param columnFamily new column family descriptor to use * @param descriptor new column descriptor to use
* @throws IOException if a remote or network exception occurs * @throws IOException if a remote or network exception occurs
* @deprecated As of release 2.0.0.
* (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>).
* This will be removed in HBase 3.0.0.
* Use {@link #modifyColumnFamily(TableName, HColumnDescriptor)}.
*/ */
@Override @Override
@Deprecated public void modifyColumn(final TableName tableName, final HColumnDescriptor descriptor)
public void modifyColumn(final TableName tableName, final HColumnDescriptor columnFamily)
throws IOException {
modifyColumnFamily(tableName, columnFamily);
}
@Override
public void modifyColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily)
throws IOException { throws IOException {
executeCallable(new MasterCallable<Void>(getConnection()) { executeCallable(new MasterCallable<Void>(getConnection()) {
@Override @Override
public Void call(int callTimeout) throws ServiceException { public Void call(int callTimeout) throws ServiceException {
ModifyColumnRequest req = ModifyColumnRequest req = RequestConverter.buildModifyColumnRequest(tableName, descriptor);
RequestConverter.buildModifyColumnRequest(tableName, columnFamily);
master.modifyColumn(null,req); master.modifyColumn(null,req);
return null; return null;
} }

2
hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java
View File

@ -101,7 +101,7 @@ public class IntegrationTestIngestWithEncryption extends IntegrationTestIngest {
LOG.info("Updating CF schema for " + getTablename() + "." + LOG.info("Updating CF schema for " + getTablename() + "." +
columnDescriptor.getNameAsString()); columnDescriptor.getNameAsString());
admin.disableTable(getTablename()); admin.disableTable(getTablename());
admin.modifyColumnFamily(getTablename(), columnDescriptor); admin.modifyColumn(getTablename(), columnDescriptor);
admin.enableTable(getTablename()); admin.enableTable(getTablename());
util.waitFor(30000, 1000, true, new Predicate<IOException>() { util.waitFor(30000, 1000, true, new Predicate<IOException>() {
@Override @Override

4
hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java
View File

@ -159,9 +159,9 @@ public class SchemaResource extends ResourceBase {
hcd.setValue(e.getKey().getLocalPart(), e.getValue().toString()); hcd.setValue(e.getKey().getLocalPart(), e.getValue().toString());
} }
if (htd.hasFamily(hcd.getName())) { if (htd.hasFamily(hcd.getName())) {
admin.modifyColumnFamily(name, hcd); admin.modifyColumn(name, hcd);
} else { } else {
admin.addColumnFamily(name, hcd); admin.addColumn(name, hcd);
} }
} }
} catch (IOException e) { } catch (IOException e) {

2
hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java
View File

@ -341,7 +341,7 @@ public class TestHFileArchiving {
List<String> storeFiles = region.getStoreFileList(columns); List<String> storeFiles = region.getStoreFileList(columns);
// then delete the table so the hfiles get archived // then delete the table so the hfiles get archived
UTIL.getHBaseAdmin().deleteColumnFamily(TABLE_NAME, TEST_FAM); UTIL.getHBaseAdmin().deleteColumn(TABLE_NAME, TEST_FAM);
assertArchiveFiles(fs, storeFiles, 30000); assertArchiveFiles(fs, storeFiles, 30000);

20
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java
View File

@ -145,7 +145,7 @@ public class TestAdmin1 {
HColumnDescriptor nonexistentHcd = new HColumnDescriptor(nonexistentColumn); HColumnDescriptor nonexistentHcd = new HColumnDescriptor(nonexistentColumn);
Exception exception = null; Exception exception = null;
try { try {
this.admin.addColumnFamily(nonexistentTable, nonexistentHcd); this.admin.addColumn(nonexistentTable, nonexistentHcd);
} catch (IOException e) { } catch (IOException e) {
exception = e; exception = e;
} }
@ -161,7 +161,7 @@ public class TestAdmin1 {
exception = null; exception = null;
try { try {
this.admin.deleteColumnFamily(nonexistentTable, nonexistentColumn); this.admin.deleteColumn(nonexistentTable, nonexistentColumn);
} catch (IOException e) { } catch (IOException e) {
exception = e; exception = e;
} }
@ -185,7 +185,7 @@ public class TestAdmin1 {
exception = null; exception = null;
try { try {
this.admin.modifyColumnFamily(nonexistentTable, nonexistentHcd); this.admin.modifyColumn(nonexistentTable, nonexistentHcd);
} catch (IOException e) { } catch (IOException e) {
exception = e; exception = e;
} }
@ -211,7 +211,7 @@ public class TestAdmin1 {
try { try {
exception = null; exception = null;
try { try {
this.admin.deleteColumnFamily(htd.getTableName(), nonexistentHcd.getName()); this.admin.deleteColumn(htd.getTableName(), nonexistentHcd.getName());
} catch (IOException e) { } catch (IOException e) {
exception = e; exception = e;
} }
@ -220,7 +220,7 @@ public class TestAdmin1 {
exception = null; exception = null;
try { try {
this.admin.modifyColumnFamily(htd.getTableName(), nonexistentHcd); this.admin.modifyColumn(htd.getTableName(), nonexistentHcd);
} catch (IOException e) { } catch (IOException e) {
exception = e; exception = e;
} }
@ -545,7 +545,7 @@ public class TestAdmin1 {
final byte [] hcdName = hcd.getName(); final byte [] hcdName = hcd.getName();
expectedException = false; expectedException = false;
try { try {
this.admin.modifyColumnFamily(tableName, hcd); this.admin.modifyColumn(tableName, hcd);
} catch (TableNotDisabledException re) { } catch (TableNotDisabledException re) {
expectedException = true; expectedException = true;
} }
@ -561,7 +561,7 @@ public class TestAdmin1 {
xtracol.setValue(xtracolName, xtracolName); xtracol.setValue(xtracolName, xtracolName);
expectedException = false; expectedException = false;
try { try {
this.admin.addColumnFamily(tableName, xtracol); this.admin.addColumn(tableName, xtracol);
} catch (TableNotDisabledException re) { } catch (TableNotDisabledException re) {
expectedException = true; expectedException = true;
} }
@ -573,7 +573,7 @@ public class TestAdmin1 {
assertTrue(hcd.getValue(xtracolName).equals(xtracolName)); assertTrue(hcd.getValue(xtracolName).equals(xtracolName));
// Delete the just-added column. // Delete the just-added column.
this.admin.deleteColumnFamily(tableName, xtracol.getName()); this.admin.deleteColumn(tableName, xtracol.getName());
modifiedHtd = this.admin.getTableDescriptor(tableName); modifiedHtd = this.admin.getTableDescriptor(tableName);
hcd = modifiedHtd.getFamily(xtracol.getName()); hcd = modifiedHtd.getFamily(xtracol.getName());
assertTrue(hcd == null); assertTrue(hcd == null);
@ -1292,10 +1292,10 @@ public class TestAdmin1 {
//expected //expected
} }
this.admin.addColumnFamily(tableName, new HColumnDescriptor("col2")); this.admin.addColumn(tableName, new HColumnDescriptor("col2"));
this.admin.enableTable(tableName); this.admin.enableTable(tableName);
try { try {
this.admin.deleteColumnFamily(tableName, Bytes.toBytes("col2")); this.admin.deleteColumn(tableName, Bytes.toBytes("col2"));
} catch (TableNotDisabledException e) { } catch (TableNotDisabledException e) {
LOG.info(e); LOG.info(e);
} }

2
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java
View File

@ -181,7 +181,7 @@ public class TestRestoreSnapshotFromClient {
// Add one column family and put some data in it // Add one column family and put some data in it
admin.disableTable(tableName); admin.disableTable(tableName);
admin.addColumnFamily(tableName, new HColumnDescriptor(TEST_FAMILY2)); admin.addColumn(tableName, new HColumnDescriptor(TEST_FAMILY2));
admin.enableTable(tableName); admin.enableTable(tableName);
assertEquals(2, table.getTableDescriptor().getFamilies().size()); assertEquals(2, table.getTableDescriptor().getFamilies().size());
HTableDescriptor htd = admin.getTableDescriptor(tableName); HTableDescriptor htd = admin.getTableDescriptor(tableName);

2
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotCloneIndependence.java
View File

@ -355,7 +355,7 @@ public class TestSnapshotCloneIndependence {
HColumnDescriptor hcd = new HColumnDescriptor(TEST_FAM_2); HColumnDescriptor hcd = new HColumnDescriptor(TEST_FAM_2);
admin.disableTable(localTableName); admin.disableTable(localTableName);
admin.addColumnFamily(localTableName, hcd); admin.addColumn(localTableName, hcd);
// Verify that it is not in the snapshot // Verify that it is not in the snapshot
admin.enableTable(localTableName); admin.enableTable(localTableName);

2
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java
View File

@ -296,7 +296,7 @@ public class TestSnapshotMetadata {
admin.disableTable(originalTableName); admin.disableTable(originalTableName);
HColumnDescriptor hcd = new HColumnDescriptor(newFamilyName); HColumnDescriptor hcd = new HColumnDescriptor(newFamilyName);
admin.addColumnFamily(originalTableName, hcd); admin.addColumn(originalTableName, hcd);
assertTrue("New column family was not added.", assertTrue("New column family was not added.",
admin.getTableDescriptor(originalTableName).toString().contains(newFamilyNameAsString)); admin.getTableDescriptor(originalTableName).toString().contains(newFamilyNameAsString));
} }

10
hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
View File

@ -1259,14 +1259,14 @@ public class TestMasterObserver {
cp.wasModifyTableCalled()); cp.wasModifyTableCalled());
// add a column family // add a column family
admin.addColumnFamily(tableName, new HColumnDescriptor(TEST_FAMILY2)); admin.addColumn(tableName, new HColumnDescriptor(TEST_FAMILY2));
assertTrue("New column family shouldn't have been added to test table", assertTrue("New column family shouldn't have been added to test table",
cp.preAddColumnCalledOnly()); cp.preAddColumnCalledOnly());
// modify a column family // modify a column family
HColumnDescriptor hcd1 = new HColumnDescriptor(TEST_FAMILY2); HColumnDescriptor hcd1 = new HColumnDescriptor(TEST_FAMILY2);
hcd1.setMaxVersions(25); hcd1.setMaxVersions(25);
admin.modifyColumnFamily(tableName, hcd1); admin.modifyColumn(tableName, hcd1);
assertTrue("Second column family should be modified", assertTrue("Second column family should be modified",
cp.preModifyColumnCalledOnly()); cp.preModifyColumnCalledOnly());
@ -1313,7 +1313,7 @@ public class TestMasterObserver {
assertTrue("Test table should have been modified", assertTrue("Test table should have been modified",
cp.wasModifyTableCalled()); cp.wasModifyTableCalled());
// add a column family // add a column family
admin.addColumnFamily(tableName, new HColumnDescriptor(TEST_FAMILY2)); admin.addColumn(tableName, new HColumnDescriptor(TEST_FAMILY2));
assertTrue("New column family should have been added to test table", assertTrue("New column family should have been added to test table",
cp.wasAddColumnCalled()); cp.wasAddColumnCalled());
assertTrue("Add column handler should be called.", assertTrue("Add column handler should be called.",
@ -1322,7 +1322,7 @@ public class TestMasterObserver {
// modify a column family // modify a column family
HColumnDescriptor hcd = new HColumnDescriptor(TEST_FAMILY2); HColumnDescriptor hcd = new HColumnDescriptor(TEST_FAMILY2);
hcd.setMaxVersions(25); hcd.setMaxVersions(25);
admin.modifyColumnFamily(tableName, hcd); admin.modifyColumn(tableName, hcd);
assertTrue("Second column family should be modified", assertTrue("Second column family should be modified",
cp.wasModifyColumnCalled()); cp.wasModifyColumnCalled());
assertTrue("Modify table handler should be called.", assertTrue("Modify table handler should be called.",
@ -1346,7 +1346,7 @@ public class TestMasterObserver {
assertFalse("No column family deleted yet", cp.wasDeleteColumnCalled()); assertFalse("No column family deleted yet", cp.wasDeleteColumnCalled());
assertFalse("Delete table column handler should not be called.", assertFalse("Delete table column handler should not be called.",
cp.wasDeleteColumnHandlerCalled()); cp.wasDeleteColumnHandlerCalled());
admin.deleteColumnFamily(tableName, TEST_FAMILY2); admin.deleteColumn(tableName, TEST_FAMILY2);
HTableDescriptor tableDesc = admin.getTableDescriptor(tableName); HTableDescriptor tableDesc = admin.getTableDescriptor(tableName);
assertNull("'"+Bytes.toString(TEST_FAMILY2)+"' should have been removed", assertNull("'"+Bytes.toString(TEST_FAMILY2)+"' should have been removed",
tableDesc.getFamily(TEST_FAMILY2)); tableDesc.getFamily(TEST_FAMILY2));

2
hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestChangingEncoding.java
View File

@ -180,7 +180,7 @@ public class TestChangingEncoding {
if (!onlineChange) { if (!onlineChange) {
admin.disableTable(tableName); admin.disableTable(tableName);
} }
admin.modifyColumnFamily(tableName, hcd); admin.modifyColumn(tableName, hcd);
if (!onlineChange) { if (!onlineChange) {
admin.enableTable(tableName); admin.enableTable(tableName);
} }

2
hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestLoadAndSwitchEncodeOnDisk.java
View File

@ -79,7 +79,7 @@ public class TestLoadAndSwitchEncodeOnDisk extends
assertAllOnLine(t); assertAllOnLine(t);
admin.disableTable(TABLE); admin.disableTable(TABLE);
admin.modifyColumnFamily(TABLE, hcd); admin.modifyColumn(TABLE, hcd);
System.err.println("\nRe-enabling table\n"); System.err.println("\nRe-enabling table\n");
admin.enableTable(TABLE); admin.enableTable(TABLE);

2
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java
View File

@ -138,7 +138,7 @@ public class TestTableLockManager {
@Override @Override
public Object call() throws Exception { public Object call() throws Exception {
Admin admin = TEST_UTIL.getHBaseAdmin(); Admin admin = TEST_UTIL.getHBaseAdmin();
admin.addColumnFamily(TABLE_NAME, new HColumnDescriptor(NEW_FAMILY)); admin.addColumn(TABLE_NAME, new HColumnDescriptor(NEW_FAMILY));
LOG.info("Added new column family"); LOG.info("Added new column family");
HTableDescriptor tableDesc = admin.getTableDescriptor(TABLE_NAME); HTableDescriptor tableDesc = admin.getTableDescriptor(TABLE_NAME);
assertTrue(tableDesc.getFamiliesKeys().contains(NEW_FAMILY)); assertTrue(tableDesc.getFamiliesKeys().contains(NEW_FAMILY));

6
hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestTableDeleteFamilyHandler.java
View File

@ -151,7 +151,7 @@ public class TestTableDeleteFamilyHandler {
// TEST - Disable and delete the column family // TEST - Disable and delete the column family
admin.disableTable(TABLENAME); admin.disableTable(TABLENAME);
admin.deleteColumnFamily(TABLENAME, Bytes.toBytes("cf2")); admin.deleteColumn(TABLENAME, Bytes.toBytes("cf2"));
// 5 - Check if only 2 column families exist in the descriptor // 5 - Check if only 2 column families exist in the descriptor
HTableDescriptor afterhtd = admin.getTableDescriptor(TABLENAME); HTableDescriptor afterhtd = admin.getTableDescriptor(TABLENAME);
@ -241,7 +241,7 @@ public class TestTableDeleteFamilyHandler {
if (admin.isTableEnabled(TABLENAME)) { if (admin.isTableEnabled(TABLENAME)) {
admin.disableTable(TABLENAME); admin.disableTable(TABLENAME);
} }
admin.deleteColumnFamily(TABLENAME, Bytes.toBytes(cfToDelete)); admin.deleteColumn(TABLENAME, Bytes.toBytes(cfToDelete));
// 5 - Check if the target column family is gone from the FS // 5 - Check if the target column family is gone from the FS
fileStatus = fs.listStatus(tableDir); fileStatus = fs.listStatus(tableDir);
@ -266,7 +266,7 @@ public class TestTableDeleteFamilyHandler {
try { try {
// Test: delete again // Test: delete again
admin.deleteColumnFamily(TABLENAME, Bytes.toBytes(cfToDelete)); admin.deleteColumn(TABLENAME, Bytes.toBytes(cfToDelete));
Assert.fail("Delete a non-exist column family should fail"); Assert.fail("Delete a non-exist column family should fail");
} catch (InvalidFamilyOperationException e) { } catch (InvalidFamilyOperationException e) {
// Expected. // Expected.

16
hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestTableDescriptorModification.java
View File

@ -118,7 +118,7 @@ public class TestTableDescriptorModification {
verifyTableDescriptor(TABLE_NAME, FAMILY_0); verifyTableDescriptor(TABLE_NAME, FAMILY_0);
// Modify the table removing one family and verify the descriptor // Modify the table removing one family and verify the descriptor
admin.addColumnFamily(TABLE_NAME, new HColumnDescriptor(FAMILY_1)); admin.addColumn(TABLE_NAME, new HColumnDescriptor(FAMILY_1));
verifyTableDescriptor(TABLE_NAME, FAMILY_0, FAMILY_1); verifyTableDescriptor(TABLE_NAME, FAMILY_0, FAMILY_1);
} finally { } finally {
admin.deleteTable(TABLE_NAME); admin.deleteTable(TABLE_NAME);
@ -138,12 +138,12 @@ public class TestTableDescriptorModification {
verifyTableDescriptor(TABLE_NAME, FAMILY_0); verifyTableDescriptor(TABLE_NAME, FAMILY_0);
// Modify the table removing one family and verify the descriptor // Modify the table removing one family and verify the descriptor
admin.addColumnFamily(TABLE_NAME, new HColumnDescriptor(FAMILY_1)); admin.addColumn(TABLE_NAME, new HColumnDescriptor(FAMILY_1));
verifyTableDescriptor(TABLE_NAME, FAMILY_0, FAMILY_1); verifyTableDescriptor(TABLE_NAME, FAMILY_0, FAMILY_1);
try { try {
// Add same column family again - expect failure // Add same column family again - expect failure
admin.addColumnFamily(TABLE_NAME, new HColumnDescriptor(FAMILY_1)); admin.addColumn(TABLE_NAME, new HColumnDescriptor(FAMILY_1));
Assert.fail("Delete a non-exist column family should fail"); Assert.fail("Delete a non-exist column family should fail");
} catch (InvalidFamilyOperationException e) { } catch (InvalidFamilyOperationException e) {
// Expected. // Expected.
@ -173,7 +173,7 @@ public class TestTableDescriptorModification {
cfDescriptor.setBlocksize(newBlockSize); cfDescriptor.setBlocksize(newBlockSize);
// Modify colymn family // Modify colymn family
admin.modifyColumnFamily(TABLE_NAME, cfDescriptor); admin.modifyColumn(TABLE_NAME, cfDescriptor);
HTableDescriptor htd = admin.getTableDescriptor(TABLE_NAME); HTableDescriptor htd = admin.getTableDescriptor(TABLE_NAME);
HColumnDescriptor hcfd = htd.getFamily(FAMILY_0); HColumnDescriptor hcfd = htd.getFamily(FAMILY_0);
@ -203,7 +203,7 @@ public class TestTableDescriptorModification {
// Modify a column family that is not in the table. // Modify a column family that is not in the table.
try { try {
admin.modifyColumnFamily(TABLE_NAME, cfDescriptor); admin.modifyColumn(TABLE_NAME, cfDescriptor);
Assert.fail("Modify a non-exist column family should fail"); Assert.fail("Modify a non-exist column family should fail");
} catch (InvalidFamilyOperationException e) { } catch (InvalidFamilyOperationException e) {
// Expected. // Expected.
@ -228,7 +228,7 @@ public class TestTableDescriptorModification {
verifyTableDescriptor(TABLE_NAME, FAMILY_0, FAMILY_1); verifyTableDescriptor(TABLE_NAME, FAMILY_0, FAMILY_1);
// Modify the table removing one family and verify the descriptor // Modify the table removing one family and verify the descriptor
admin.deleteColumnFamily(TABLE_NAME, FAMILY_1); admin.deleteColumn(TABLE_NAME, FAMILY_1);
verifyTableDescriptor(TABLE_NAME, FAMILY_0); verifyTableDescriptor(TABLE_NAME, FAMILY_0);
} finally { } finally {
admin.deleteTable(TABLE_NAME); admin.deleteTable(TABLE_NAME);
@ -249,12 +249,12 @@ public class TestTableDescriptorModification {
verifyTableDescriptor(TABLE_NAME, FAMILY_0, FAMILY_1); verifyTableDescriptor(TABLE_NAME, FAMILY_0, FAMILY_1);
// Modify the table removing one family and verify the descriptor // Modify the table removing one family and verify the descriptor
admin.deleteColumnFamily(TABLE_NAME, FAMILY_1); admin.deleteColumn(TABLE_NAME, FAMILY_1);
verifyTableDescriptor(TABLE_NAME, FAMILY_0); verifyTableDescriptor(TABLE_NAME, FAMILY_0);
try { try {
// Delete again - expect failure // Delete again - expect failure
admin.deleteColumnFamily(TABLE_NAME, FAMILY_1); admin.deleteColumn(TABLE_NAME, FAMILY_1);
Assert.fail("Delete a non-exist column family should fail"); Assert.fail("Delete a non-exist column family should fail");
} catch (Exception e) { } catch (Exception e) {
// Expected. // Expected.

2
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java
View File

@ -118,7 +118,7 @@ public class TestEncryptionKeyRotation {
hcd.setEncryptionKey(EncryptionUtil.wrapKey(conf, hcd.setEncryptionKey(EncryptionUtil.wrapKey(conf,
conf.get(HConstants.CRYPTO_MASTERKEY_NAME_CONF_KEY, User.getCurrent().getShortName()), conf.get(HConstants.CRYPTO_MASTERKEY_NAME_CONF_KEY, User.getCurrent().getShortName()),
secondCFKey)); secondCFKey));
TEST_UTIL.getHBaseAdmin().modifyColumnFamily(htd.getTableName(), hcd); TEST_UTIL.getHBaseAdmin().modifyColumn(htd.getTableName(), hcd);
Thread.sleep(5000); // Need a predicate for online schema change Thread.sleep(5000); // Need a predicate for online schema change
// And major compact // And major compact

6
hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java
View File

@ -652,19 +652,19 @@ public abstract class TestVisibilityLabels {
} }
try { try {
HColumnDescriptor hcd = new HColumnDescriptor("testFamily"); HColumnDescriptor hcd = new HColumnDescriptor("testFamily");
admin.addColumnFamily(LABELS_TABLE_NAME, hcd); admin.addColumn(LABELS_TABLE_NAME, hcd);
fail("Lables table should not get altered by user."); fail("Lables table should not get altered by user.");
} catch (Exception e) { } catch (Exception e) {
} }
try { try {
admin.deleteColumnFamily(LABELS_TABLE_NAME, VisibilityConstants.LABELS_TABLE_FAMILY); admin.deleteColumn(LABELS_TABLE_NAME, VisibilityConstants.LABELS_TABLE_FAMILY);
fail("Lables table should not get altered by user."); fail("Lables table should not get altered by user.");
} catch (Exception e) { } catch (Exception e) {
} }
try { try {
HColumnDescriptor hcd = new HColumnDescriptor(VisibilityConstants.LABELS_TABLE_FAMILY); HColumnDescriptor hcd = new HColumnDescriptor(VisibilityConstants.LABELS_TABLE_FAMILY);
hcd.setBloomFilterType(BloomType.ROWCOL); hcd.setBloomFilterType(BloomType.ROWCOL);
admin.modifyColumnFamily(LABELS_TABLE_NAME, hcd); admin.modifyColumn(LABELS_TABLE_NAME, hcd);
fail("Lables table should not get altered by user."); fail("Lables table should not get altered by user.");
} catch (Exception e) { } catch (Exception e) {
} }

4
hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
View File

@ -300,9 +300,9 @@ public class LoadTestTool extends AbstractHBaseTool {
cipher.getName()))); cipher.getName())));
} }
if (isNewCf) { if (isNewCf) {
admin.addColumnFamily(tableName, columnDesc); admin.addColumn(tableName, columnDesc);
} else { } else {
admin.modifyColumnFamily(tableName, columnDesc); admin.modifyColumn(tableName, columnDesc);
} }
} }
LOG.info("Enabling table " + tableName); LOG.info("Enabling table " + tableName);