Skip to content

Commit d2f5a5f

Browse files
Apache9Apache9
authored
HBAE-24507 Remove HTableDescriptor and HColumnDescriptor (#2186)
Signed-off-by: stack <[email protected]> Signed-off-by: Viraj Jasani <[email protected]> Signed-off-by: tedyu <[email protected]>
1 parent 148c185 commit d2f5a5f

File tree

182 files changed

+1960
-5132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+1960
-5132
lines changed

‎hbase-archetypes/hbase-shaded-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/shaded_client/HelloHBase.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,8 @@ static void createNamespaceAndTable(final Admin admin) throws IOException {
110110
+ "], with one Column Family ["
111111
+ Bytes.toString(MY_COLUMN_FAMILY_NAME) + "].");
112112

113-
admin.createTable(new TableDescriptorBuilder.ModifyableTableDescriptor(MY_TABLE_NAME)
114-
.setColumnFamily(
115-
new ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor(
116-
MY_COLUMN_FAMILY_NAME)));
113+
admin.createTable(TableDescriptorBuilder.newBuilder(MY_TABLE_NAME)
114+
.setColumnFamily(ColumnFamilyDescriptorBuilder.of(MY_COLUMN_FAMILY_NAME)).build());
117115
}
118116
}
119117

‎hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBase.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@
4747
import org.apache.hadoop.hbase.backup.master.LogRollMasterProcedureManager;
4848
import org.apache.hadoop.hbase.backup.util.BackupUtils;
4949
import org.apache.hadoop.hbase.client.Admin;
50-
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
5150
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
5251
import org.apache.hadoop.hbase.client.Connection;
5352
import org.apache.hadoop.hbase.client.ConnectionFactory;
5453
import org.apache.hadoop.hbase.client.Durability;
5554
import org.apache.hadoop.hbase.client.Put;
5655
import org.apache.hadoop.hbase.client.Table;
56+
import org.apache.hadoop.hbase.client.TableDescriptor;
5757
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
5858
import org.apache.hadoop.hbase.master.cleaner.LogCleaner;
5959
import org.apache.hadoop.hbase.master.cleaner.TimeToLiveLogCleaner;
@@ -84,7 +84,7 @@ public class TestBackupBase {
8484
protected static Configuration conf2;
8585

8686
protected static TableName table1 = TableName.valueOf("table1");
87-
protected static TableDescriptorBuilder.ModifyableTableDescriptor table1Desc;
87+
protected static TableDescriptor table1Desc;
8888
protected static TableName table2 = TableName.valueOf("table2");
8989
protected static TableName table3 = TableName.valueOf("table3");
9090
protected static TableName table4 = TableName.valueOf("table4");
@@ -428,20 +428,17 @@ protected static void createTables() throws Exception {
428428
ha.createNamespace(desc3);
429429
ha.createNamespace(desc4);
430430

431-
TableDescriptorBuilder.ModifyableTableDescriptor desc =
432-
new TableDescriptorBuilder.ModifyableTableDescriptor(table1);
433-
ColumnFamilyDescriptor familyDescriptor =
434-
new ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor(famName);
435-
desc.setColumnFamily(familyDescriptor);
431+
TableDescriptor desc = TableDescriptorBuilder.newBuilder(table1)
432+
.setColumnFamily(ColumnFamilyDescriptorBuilder.of(famName)).build();
436433
ha.createTable(desc);
437434
table1Desc = desc;
438435
Connection conn = ConnectionFactory.createConnection(conf1);
439436
Table table = conn.getTable(table1);
440437
loadTable(table);
441438
table.close();
442439
table2 = TableName.valueOf("ns2:test-" + tid + 1);
443-
desc = new TableDescriptorBuilder.ModifyableTableDescriptor(table2);
444-
desc.setColumnFamily(familyDescriptor);
440+
desc = TableDescriptorBuilder.newBuilder(table2)
441+
.setColumnFamily(ColumnFamilyDescriptorBuilder.of(famName)).build();
445442
ha.createTable(desc);
446443
table = conn.getTable(table2);
447444
loadTable(table);

‎hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackup.java‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
import org.apache.hadoop.hbase.client.ConnectionFactory;
3535
import org.apache.hadoop.hbase.client.Put;
3636
import org.apache.hadoop.hbase.client.Table;
37+
import org.apache.hadoop.hbase.client.TableDescriptor;
38+
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
3739
import org.apache.hadoop.hbase.regionserver.HRegion;
3840
import org.apache.hadoop.hbase.testclassification.LargeTests;
3941
import org.apache.hadoop.hbase.util.Bytes;
@@ -82,14 +84,11 @@ public void TestIncBackupRestore() throws Exception {
8284
final byte[] fam3Name = Bytes.toBytes("f3");
8385
final byte[] mobName = Bytes.toBytes("mob");
8486

85-
table1Desc.setColumnFamily(
86-
new ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor(fam3Name));
87-
ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor mobHcd =
88-
new ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor(mobName);
89-
mobHcd.setMobEnabled(true);
90-
mobHcd.setMobThreshold(5L);
91-
table1Desc.setColumnFamily(mobHcd);
92-
HBaseTestingUtility.modifyTableSync(TEST_UTIL.getAdmin(), table1Desc);
87+
TableDescriptor newTable1Desc = TableDescriptorBuilder.newBuilder(table1Desc)
88+
.setColumnFamily(ColumnFamilyDescriptorBuilder.of(fam3Name))
89+
.setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(mobName).setMobEnabled(true)
90+
.setMobThreshold(5L).build()).build();
91+
TEST_UTIL.getAdmin().modifyTable(newTable1Desc);
9392

9493
try (Connection conn = ConnectionFactory.createConnection(conf1)) {
9594
int NB_ROWS_FAM3 = 6;
@@ -150,13 +149,12 @@ public void TestIncBackupRestore() throws Exception {
150149
assertTrue(checkSucceeded(backupIdIncMultiple));
151150

152151
// add column family f2 to table1
153-
final byte[] fam2Name = Bytes.toBytes("f2");
154-
table1Desc.setColumnFamily(
155-
new ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor(fam2Name));
156-
157152
// drop column family f3
158-
table1Desc.removeColumnFamily(fam3Name);
159-
HBaseTestingUtility.modifyTableSync(TEST_UTIL.getAdmin(), table1Desc);
153+
final byte[] fam2Name = Bytes.toBytes("f2");
154+
newTable1Desc = TableDescriptorBuilder.newBuilder(newTable1Desc)
155+
.setColumnFamily(ColumnFamilyDescriptorBuilder.of(fam2Name)).removeColumnFamily(fam3Name)
156+
.build();
157+
TEST_UTIL.getAdmin().modifyTable(newTable1Desc);
160158

161159
int NB_ROWS_FAM2 = 7;
162160
Table t3 = insertIntoTable(conn, table1, fam2Name, 2, NB_ROWS_FAM2);

‎hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackupWithFailures.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.Collection;
2525
import java.util.List;
2626
import org.apache.hadoop.hbase.HBaseClassTestRule;
27-
import org.apache.hadoop.hbase.HBaseTestingUtility;
2827
import org.apache.hadoop.hbase.TableName;
2928
import org.apache.hadoop.hbase.backup.BackupInfo.BackupState;
3029
import org.apache.hadoop.hbase.backup.impl.BackupAdminImpl;
@@ -37,6 +36,8 @@
3736
import org.apache.hadoop.hbase.client.ConnectionFactory;
3837
import org.apache.hadoop.hbase.client.Put;
3938
import org.apache.hadoop.hbase.client.Table;
39+
import org.apache.hadoop.hbase.client.TableDescriptor;
40+
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
4041
import org.apache.hadoop.hbase.testclassification.LargeTests;
4142
import org.apache.hadoop.hbase.util.Bytes;
4243
import org.apache.hadoop.util.ToolRunner;
@@ -76,16 +77,15 @@ public TestIncrementalBackupWithFailures(Boolean b) {
7677
// implement all test cases in 1 test since incremental backup/restore has dependencies
7778
@Test
7879
public void testIncBackupRestore() throws Exception {
79-
8080
int ADD_ROWS = 99;
8181
// #1 - create full backup for all tables
8282
LOG.info("create full backup image for all tables");
8383

8484
List<TableName> tables = Lists.newArrayList(table1, table2);
8585
final byte[] fam3Name = Bytes.toBytes("f3");
86-
table1Desc.setColumnFamily(
87-
new ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor(fam3Name));
88-
HBaseTestingUtility.modifyTableSync(TEST_UTIL.getAdmin(), table1Desc);
86+
TableDescriptor newTable1Desc = TableDescriptorBuilder.newBuilder(table1Desc)
87+
.setColumnFamily(ColumnFamilyDescriptorBuilder.of(fam3Name)).build();
88+
TEST_UTIL.getAdmin().modifyTable(newTable1Desc);
8989

9090
Connection conn = ConnectionFactory.createConnection(conf1);
9191
int NB_ROWS_FAM3 = 6;

‎hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteBackup.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import java.io.IOException;
2323
import java.util.concurrent.CountDownLatch;
24-
2524
import org.apache.hadoop.hbase.HBaseClassTestRule;
2625
import org.apache.hadoop.hbase.HConstants;
2726
import org.apache.hadoop.hbase.TableName;
@@ -32,18 +31,21 @@
3231
import org.apache.hadoop.hbase.client.ConnectionFactory;
3332
import org.apache.hadoop.hbase.client.Put;
3433
import org.apache.hadoop.hbase.client.Table;
34+
import org.apache.hadoop.hbase.client.TableDescriptor;
35+
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
3536
import org.apache.hadoop.hbase.snapshot.MobSnapshotTestingUtils;
3637
import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils;
3738
import org.apache.hadoop.hbase.testclassification.LargeTests;
3839
import org.apache.hadoop.hbase.util.Bytes;
39-
import org.apache.hbase.thirdparty.com.google.common.collect.Lists;
4040
import org.junit.Assert;
4141
import org.junit.ClassRule;
4242
import org.junit.Test;
4343
import org.junit.experimental.categories.Category;
4444
import org.slf4j.Logger;
4545
import org.slf4j.LoggerFactory;
4646

47+
import org.apache.hbase.thirdparty.com.google.common.collect.Lists;
48+
4749
@Category(LargeTests.class)
4850
public class TestRemoteBackup extends TestBackupBase {
4951

@@ -93,16 +95,13 @@ public void testFullBackupRemote() throws Exception {
9395
}
9496
});
9597
t.start();
96-
97-
table1Desc.setColumnFamily(
98-
new ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor(fam3Name));
9998
// family 2 is MOB enabled
100-
ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor familyDescriptor =
101-
new ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor(fam2Name);
102-
familyDescriptor.setMobEnabled(true);
103-
familyDescriptor.setMobThreshold(0L);
104-
table1Desc.setColumnFamily(familyDescriptor);
105-
TEST_UTIL.getAdmin().modifyTable(table1Desc);
99+
TableDescriptor newTable1Desc = TableDescriptorBuilder.newBuilder(table1Desc)
100+
.setColumnFamily(ColumnFamilyDescriptorBuilder.of(fam3Name))
101+
.setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(fam2Name).setMobEnabled(true)
102+
.setMobThreshold(0L).build())
103+
.build();
104+
TEST_UTIL.getAdmin().modifyTable(newTable1Desc);
106105

107106
SnapshotTestingUtils.loadData(TEST_UTIL, table1, 50, fam2Name);
108107
Table t1 = conn.getTable(table1);

0 commit comments

Comments
 (0)