Repository: hbase Updated Branches: refs/heads/master 31da4d0bc -> 4f2133ee3
http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java index 7ea879e..e5a4f0c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java @@ -93,7 +93,7 @@ public class TestFIFOCompactionPolicy { FIFOCompactionPolicy.class.getName()) .setValue(HConstants.HBASE_REGION_SPLIT_POLICY_KEY, DisabledRegionSplitPolicy.class.getName()) - .addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(family).setTimeToLive(1).build()) + .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(family).setTimeToLive(1).build()) .build(); admin.createTable(desc); Table table = TEST_UTIL.getConnection().getTable(tableName); @@ -155,7 +155,7 @@ public class TestFIFOCompactionPolicy { FIFOCompactionPolicy.class.getName()) .setValue(HConstants.HBASE_REGION_SPLIT_POLICY_KEY, DisabledRegionSplitPolicy.class.getName()) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(family)).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(family)).build(); TEST_UTIL.getAdmin().createTable(desc); } @@ -169,7 +169,7 @@ public class TestFIFOCompactionPolicy { FIFOCompactionPolicy.class.getName()) .setValue(HConstants.HBASE_REGION_SPLIT_POLICY_KEY, DisabledRegionSplitPolicy.class.getName()) - .addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(family).setTimeToLive(1) + .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(family).setTimeToLive(1) .setMinVersions(1).build()) .build(); TEST_UTIL.getAdmin().createTable(desc); @@ -187,7 +187,7 @@ public class TestFIFOCompactionPolicy { .setValue(HConstants.HBASE_REGION_SPLIT_POLICY_KEY, DisabledRegionSplitPolicy.class.getName()) .setValue(HStore.BLOCKING_STOREFILES_KEY, "10") - .addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(family).setTimeToLive(1).build()) + .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(family).setTimeToLive(1).build()) .build(); TEST_UTIL.getAdmin().createTable(desc); } http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestCompactionWithThroughputController.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestCompactionWithThroughputController.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestCompactionWithThroughputController.java index a7cdfa5..5319d30 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestCompactionWithThroughputController.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestCompactionWithThroughputController.java @@ -203,7 +203,7 @@ public class TestCompactionWithThroughputController { try { TEST_UTIL.getAdmin() .createTable(TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(family)).setCompactionEnabled(false) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(family)).setCompactionEnabled(false) .build()); TEST_UTIL.waitTableAvailable(tableName); HRegionServer regionServer = TEST_UTIL.getRSForFirstRegionInTable(tableName); @@ -260,7 +260,7 @@ public class TestCompactionWithThroughputController { try { TEST_UTIL.getAdmin() .createTable(TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(family)).setCompactionEnabled(false) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(family)).setCompactionEnabled(false) .build()); TEST_UTIL.waitTableAvailable(tableName); HStore store = getStoreWithName(tableName); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestFlushWithThroughputController.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestFlushWithThroughputController.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestFlushWithThroughputController.java index 83533d9..1c39646 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestFlushWithThroughputController.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestFlushWithThroughputController.java @@ -173,7 +173,7 @@ public class TestFlushWithThroughputController { hbtu.startMiniCluster(1); Connection conn = ConnectionFactory.createConnection(conf); hbtu.getAdmin().createTable(TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(family)).setCompactionEnabled(false) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(family)).setCompactionEnabled(false) .build()); hbtu.waitTableAvailable(tableName); HRegionServer regionServer = hbtu.getRSForFirstRegionInTable(tableName); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestFSWAL.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestFSWAL.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestFSWAL.java index 1cdb6e5..5336963 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestFSWAL.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestFSWAL.java @@ -252,9 +252,9 @@ public abstract class AbstractTestFSWAL { AbstractFSWAL<?> wal = newWAL(FS, CommonFSUtils.getWALRootDir(conf1), DIR.toString(), HConstants.HREGION_OLDLOGDIR_NAME, conf1, null, true, null, null); TableDescriptor t1 = TableDescriptorBuilder.newBuilder(TableName.valueOf("t1")) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of("row")).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of("row")).build(); TableDescriptor t2 = TableDescriptorBuilder.newBuilder(TableName.valueOf("t2")) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of("row")).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of("row")).build(); RegionInfo hri1 = RegionInfoBuilder.newBuilder(t1.getTableName()).build(); RegionInfo hri2 = RegionInfoBuilder.newBuilder(t2.getTableName()).build(); // add edits and roll the wal @@ -361,7 +361,7 @@ public abstract class AbstractTestFSWAL { final RegionInfo hri = RegionInfoBuilder.newBuilder(tableName).build(); final byte[] rowName = tableName.getName(); final TableDescriptor htd = TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of("f")).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of("f")).build(); HRegion r = HBaseTestingUtility.createRegionAndWAL(hri, TEST_UTIL.getDefaultRootDirPath(), TEST_UTIL.getConfiguration(), htd); HBaseTestingUtility.closeRegionAndWAL(r); @@ -449,7 +449,7 @@ public abstract class AbstractTestFSWAL { CONF, null, true, null, null); wal.close(); TableDescriptor td = TableDescriptorBuilder.newBuilder(TableName.valueOf("table")) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of("row")).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of("row")).build(); RegionInfo ri = RegionInfoBuilder.newBuilder(td.getTableName()).build(); MultiVersionConcurrencyControl mvcc = new MultiVersionConcurrencyControl(); NavigableMap<byte[], Integer> scopes = new TreeMap<>(Bytes.BYTES_COMPARATOR); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestLogRolling.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestLogRolling.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestLogRolling.java index c6059b1..610af61 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestLogRolling.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestLogRolling.java @@ -305,7 +305,7 @@ public abstract class AbstractTestLogRolling { protected Table createTestTable(String tableName) throws IOException { // Create the test table and open it TableDescriptor desc = TableDescriptorBuilder.newBuilder(TableName.valueOf(getName())) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(HConstants.CATALOG_FAMILY)).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(HConstants.CATALOG_FAMILY)).build(); admin.createTable(desc); return TEST_UTIL.getConnection().getTable(desc.getTableName()); } http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java index f5fabbc..4effa6d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java @@ -291,7 +291,7 @@ public class TestDurability { private HRegion createHRegion(WALFactory wals, Durability durability) throws IOException { TableName tableName = TableName.valueOf(name.getMethodName().replaceAll("[^A-Za-z0-9-_]", "_")); TableDescriptor htd = TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)).build(); RegionInfo info = RegionInfoBuilder.newBuilder(tableName).build(); Path path = new Path(DIR, tableName.getNameAsString()); if (FS.exists(path)) { http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java index 93ea2b8..7baaa6c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java @@ -111,7 +111,7 @@ public class TestFSHLog extends AbstractTestFSWAL { syncRunnerIndexField.set(ringBufferEventHandler, Integer.MAX_VALUE - 1); TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(this.name.getMethodName())) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of("row")).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of("row")).build(); NavigableMap<byte[], Integer> scopes = new TreeMap<>(Bytes.BYTES_COMPARATOR); for (byte[] fam : htd.getColumnFamilyNames()) { scopes.put(fam, 0); @@ -160,7 +160,7 @@ public class TestFSHLog extends AbstractTestFSWAL { // open a new region which uses this WAL TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(this.name.getMethodName())) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(b)).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(b)).build(); RegionInfo hri = RegionInfoBuilder.newBuilder(htd.getTableName()).build(); ChunkCreator.initialize(MemStoreLABImpl.CHUNK_SIZE_DEFAULT, false, 0, 0, 0, null); final HRegion region = TEST_UTIL.createLocalHRegion(hri, htd, log); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java index e2b4809..3eed137 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java @@ -145,7 +145,7 @@ public class TestLogRollAbort { // Create the test table and open it TableName tableName = TableName.valueOf(this.getClass().getSimpleName()); TableDescriptor desc = TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(HConstants.CATALOG_FAMILY)).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(HConstants.CATALOG_FAMILY)).build(); admin.createTable(desc); Table table = TEST_UTIL.getConnection().getTable(tableName); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java index 55f2726..f3cf2bf 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java @@ -136,7 +136,7 @@ public class TestLogRolling extends AbstractTestLogRolling { // Create the test table and open it TableDescriptor desc = TableDescriptorBuilder.newBuilder(TableName.valueOf(getName())) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(HConstants.CATALOG_FAMILY)).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(HConstants.CATALOG_FAMILY)).build(); admin.createTable(desc); Table table = TEST_UTIL.getConnection().getTable(desc.getTableName()); @@ -244,7 +244,7 @@ public class TestLogRolling extends AbstractTestLogRolling { // Create the test table and open it TableDescriptor desc = TableDescriptorBuilder.newBuilder(TableName.valueOf(getName())) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(HConstants.CATALOG_FAMILY)).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(HConstants.CATALOG_FAMILY)).build(); admin.createTable(desc); Table table = TEST_UTIL.getConnection().getTable(desc.getTableName()); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java index 75913d2..de0b94f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java @@ -136,11 +136,11 @@ public class TestMasterReplication { CoprocessorHost.USER_REGION_COPROCESSOR_CONF_KEY, CoprocessorCounter.class.getName()); table = TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(famName) + .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(famName) .setScope(HConstants.REPLICATION_SCOPE_GLOBAL).build()) - .addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(famName1) + .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(famName1) .setScope(HConstants.REPLICATION_SCOPE_GLOBAL).build()) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(noRepfamName)).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(noRepfamName)).build(); } /** http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestNamespaceReplication.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestNamespaceReplication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestNamespaceReplication.java index 6d2b578..37da482 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestNamespaceReplication.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestNamespaceReplication.java @@ -92,18 +92,18 @@ public class TestNamespaceReplication extends TestReplicationBase { admin2.createNamespace(NamespaceDescriptor.create(ns2).build()); TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tabAName); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder + builder.setColumnFamily(ColumnFamilyDescriptorBuilder .newBuilder(f1Name).setScope(HConstants.REPLICATION_SCOPE_GLOBAL).build()); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder + builder.setColumnFamily(ColumnFamilyDescriptorBuilder .newBuilder(f2Name).setScope(HConstants.REPLICATION_SCOPE_GLOBAL).build()); TableDescriptor tabA = builder.build(); admin1.createTable(tabA); admin2.createTable(tabA); builder = TableDescriptorBuilder.newBuilder(tabBName); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder + builder.setColumnFamily(ColumnFamilyDescriptorBuilder .newBuilder(f1Name).setScope(HConstants.REPLICATION_SCOPE_GLOBAL).build()); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder + builder.setColumnFamily(ColumnFamilyDescriptorBuilder .newBuilder(f2Name).setScope(HConstants.REPLICATION_SCOPE_GLOBAL).build()); TableDescriptor tabB = builder.build(); admin1.createTable(tabB); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java index 3a7a575..397d6e2 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java @@ -232,9 +232,9 @@ public class TestReplicationBase { hbaseAdmin.addReplicationPeer("2", rpc); TableDescriptor table = TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(famName).setMaxVersions(100) + .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(famName).setMaxVersions(100) .setScope(HConstants.REPLICATION_SCOPE_GLOBAL).build()) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(noRepfamName)).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(noRepfamName)).build(); scopes = new TreeMap<>(Bytes.BYTES_COMPARATOR); for (ColumnFamilyDescriptor f : table.getColumnFamilies()) { scopes.put(f.getName(), f.getScope()); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java index f5d2a2d..8d24f5e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java @@ -348,7 +348,7 @@ public class TestReplicationSmallTests extends TestReplicationBase { // Create Tables for (int i = 0; i < numOfTables; i++) { hadmin.createTable(TableDescriptorBuilder.newBuilder(TableName.valueOf(tName + i)) - .addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes(colFam)) + .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes(colFam)) .setScope(HConstants.REPLICATION_SCOPE_GLOBAL).build()) .build()); } http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestSerialReplication.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestSerialReplication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestSerialReplication.java index f8efcf0..4e8a4cc 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestSerialReplication.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestSerialReplication.java @@ -234,7 +234,7 @@ public class TestSerialReplication { public void testRegionMove() throws Exception { TableName tableName = TableName.valueOf(name.getMethodName()); UTIL.getAdmin().createTable( - TableDescriptorBuilder.newBuilder(tableName).addColumnFamily(ColumnFamilyDescriptorBuilder + TableDescriptorBuilder.newBuilder(tableName).setColumnFamily(ColumnFamilyDescriptorBuilder .newBuilder(CF).setScope(HConstants.REPLICATION_SCOPE_GLOBAL).build()).build()); UTIL.waitTableAvailable(tableName); try (Table table = UTIL.getConnection().getTable(tableName)) { @@ -273,7 +273,7 @@ public class TestSerialReplication { public void testRegionSplit() throws Exception { TableName tableName = TableName.valueOf(name.getMethodName()); UTIL.getAdmin().createTable( - TableDescriptorBuilder.newBuilder(tableName).addColumnFamily(ColumnFamilyDescriptorBuilder + TableDescriptorBuilder.newBuilder(tableName).setColumnFamily(ColumnFamilyDescriptorBuilder .newBuilder(CF).setScope(HConstants.REPLICATION_SCOPE_GLOBAL).build()).build()); UTIL.waitTableAvailable(tableName); try (Table table = UTIL.getConnection().getTable(tableName)) { @@ -330,7 +330,7 @@ public class TestSerialReplication { TableName tableName = TableName.valueOf(name.getMethodName()); UTIL.getAdmin().createTable( TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(CF) + .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(CF) .setScope(HConstants.REPLICATION_SCOPE_GLOBAL).build()) .build(), new byte[][] { splitKey }); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java index 407ebf9..3655352 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java @@ -666,7 +666,7 @@ public class SecureTestUtil { byte[][] families) throws Exception { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName); for (byte[] family : families) { - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(family)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(family)); } createTable(testUtil, testUtil.getAdmin(), builder.build()); return testUtil.getConnection().getTable(tableName); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOnNewVersionBehaviorTable.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOnNewVersionBehaviorTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOnNewVersionBehaviorTable.java index 4093ace..6490530 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOnNewVersionBehaviorTable.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOnNewVersionBehaviorTable.java @@ -42,7 +42,7 @@ public class TestVisibilityLabelsOnNewVersionBehaviorTable TableName tableName = TableName.valueOf(testName.getMethodName()); TEST_UTIL.getAdmin() .createTable(TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily( + .setColumnFamily( ColumnFamilyDescriptorBuilder.newBuilder(fam).setNewVersionBehavior(true).build()) .build()); return TEST_UTIL.getConnection().getTable(tableName); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDeletes.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDeletes.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDeletes.java index ce8e2eb..b0cabed 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDeletes.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDeletes.java @@ -64,7 +64,7 @@ public class TestVisibilityLabelsWithDeletes extends VisibilityLabelsWithDeletes protected Table createTable(byte[] fam) throws IOException { TableName tableName = TableName.valueOf(testName.getMethodName()); TEST_UTIL.getAdmin().createTable(TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(fam)).build()); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(fam)).build()); return TEST_UTIL.getConnection().getTable(tableName); } @@ -84,7 +84,7 @@ public class TestVisibilityLabelsWithDeletes extends VisibilityLabelsWithDeletes builder.setMaxVersions(maxVersions); } TEST_UTIL.getAdmin().createTable( - TableDescriptorBuilder.newBuilder(tableName).addColumnFamily(builder.build()).build()); + TableDescriptorBuilder.newBuilder(tableName).setColumnFamily(builder.build()).build()); } @Test http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/MobSnapshotTestingUtils.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/MobSnapshotTestingUtils.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/MobSnapshotTestingUtils.java index 1a33f13..75b6c23 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/MobSnapshotTestingUtils.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/MobSnapshotTestingUtils.java @@ -66,7 +66,7 @@ public class MobSnapshotTestingUtils { = TableDescriptorBuilder.newBuilder(tableName) .setRegionReplication(regionReplication); for (byte[] family : families) { - builder.addColumnFamily(ColumnFamilyDescriptorBuilder + builder.setColumnFamily(ColumnFamilyDescriptorBuilder .newBuilder(family) .setMobEnabled(true) .setMobThreshold(0L) @@ -96,7 +96,7 @@ public class MobSnapshotTestingUtils { // tests have hard coded counts of what to expect in block cache, etc., // and blooms being // on is interfering. - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(family) + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(family) .setBloomFilterType(BloomType.NONE) .setMobEnabled(true) .setMobThreshold(0L) @@ -152,7 +152,7 @@ public class MobSnapshotTestingUtils { @Override public TableDescriptor createHtd(final String tableName) { return TableDescriptorBuilder.newBuilder(TableName.valueOf(tableName)) - .addColumnFamily(ColumnFamilyDescriptorBuilder + .setColumnFamily(ColumnFamilyDescriptorBuilder .newBuilder(Bytes.toBytes(TEST_FAMILY)) .setMobEnabled(true) .setMobThreshold(0L) http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java index 5aca352..e798839 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java @@ -694,7 +694,7 @@ public final class SnapshotTestingUtils { public TableDescriptor createHtd(final String tableName) { return TableDescriptorBuilder.newBuilder(TableName.valueOf(tableName)) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(TEST_FAMILY)) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(TEST_FAMILY)) .build(); } @@ -772,7 +772,7 @@ public final class SnapshotTestingUtils { .newBuilder(tableName) .setRegionReplication(regionReplication); for (byte[] family : families) { - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(family)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(family)); } byte[][] splitKeys = getSplitKeys(nRegions); util.createTable(builder.build(), splitKeys); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFiles.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFiles.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFiles.java index 9da82a4..85235b6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFiles.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFiles.java @@ -236,7 +236,7 @@ public class TestLoadIncrementalHFiles { private TableDescriptor buildHTD(TableName tableName, BloomType bloomType) { return TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily( + .setColumnFamily( ColumnFamilyDescriptorBuilder.newBuilder(FAMILY).setBloomFilterType(bloomType).build()) .build(); } @@ -462,7 +462,7 @@ public class TestLoadIncrementalHFiles { // set real family name to upper case in purpose to simulate the case that // family name in HFiles is invalid TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(TABLE)) - .addColumnFamily(ColumnFamilyDescriptorBuilder + .setColumnFamily(ColumnFamilyDescriptorBuilder .of(Bytes.toBytes(new String(FAMILY).toUpperCase(Locale.ROOT)))) .build(); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFilesSplitRecovery.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFilesSplitRecovery.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFilesSplitRecovery.java index 48a6d23..a4b99a1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFilesSplitRecovery.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFilesSplitRecovery.java @@ -144,7 +144,7 @@ public class TestLoadIncrementalHFilesSplitRecovery { private TableDescriptor createTableDesc(TableName name, int cfs) { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(name); IntStream.range(0, cfs).mapToObj(i -> ColumnFamilyDescriptorBuilder.of(family(i))) - .forEachOrdered(builder::addColumnFamily); + .forEachOrdered(builder::setColumnFamily); return builder.build(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java index 0ddc0c3..11c7bcd 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java @@ -238,7 +238,7 @@ public class TestFSTableDescriptors { // Update the table infos for (int i = 0; i < count; i++) { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(TableName.valueOf(name + i)); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of("" + i)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of("" + i)); htds.updateTableDescriptor(builder.build()); } // Wait a while so mod time we write is for sure different. @@ -275,7 +275,7 @@ public class TestFSTableDescriptors { // Update the table infos for (int i = 0; i < count; i++) { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(TableName.valueOf(name + i)); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of("" + i)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of("" + i)); htds.updateTableDescriptor(builder.build()); } for (int i = 0; i < count; i++) { http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestFSHLogProvider.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestFSHLogProvider.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestFSHLogProvider.java index c3615a2..2548a17 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestFSHLogProvider.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestFSHLogProvider.java @@ -186,10 +186,10 @@ public class TestFSHLogProvider { LOG.info(currentTest.getMethodName()); TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(currentTest.getMethodName())) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of("row")).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of("row")).build(); TableDescriptor htd2 = TableDescriptorBuilder.newBuilder(TableName.valueOf(currentTest.getMethodName() + "2")) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of("row")).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of("row")).build(); NavigableMap<byte[], Integer> scopes1 = new TreeMap<>(Bytes.BYTES_COMPARATOR); for (byte[] fam : htd.getColumnFamilyNames()) { scopes1.put(fam, 0); @@ -266,10 +266,10 @@ public class TestFSHLogProvider { LOG.debug(currentTest.getMethodName()); TableDescriptor table1 = TableDescriptorBuilder.newBuilder(TableName.valueOf(currentTest.getMethodName() + "1")) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of("row")).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of("row")).build(); TableDescriptor table2 = TableDescriptorBuilder.newBuilder(TableName.valueOf(currentTest.getMethodName() + "2")) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of("row")).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of("row")).build(); NavigableMap<byte[], Integer> scopes1 = new TreeMap<>(Bytes.BYTES_COMPARATOR); for (byte[] fam : table1.getColumnFamilyNames()) { scopes1.put(fam, 0); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java index 66d2c94..b1fe67b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java @@ -494,7 +494,7 @@ public class TestWALFactory { int colCount = 10; TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(currentTest.getMethodName())) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of("column")).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of("column")).build(); NavigableMap<byte[], Integer> scopes = new TreeMap<byte[], Integer>(Bytes.BYTES_COMPARATOR); for (byte[] fam : htd.getColumnFamilyNames()) { scopes.put(fam, 0); @@ -555,7 +555,7 @@ public class TestWALFactory { int colCount = 10; TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(currentTest.getMethodName())) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of("column")).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of("column")).build(); NavigableMap<byte[], Integer> scopes = new TreeMap<byte[], Integer>(Bytes.BYTES_COMPARATOR); for (byte[] fam : htd.getColumnFamilyNames()) { scopes.put(fam, 0); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java index 7afbb0b..9a8bddf 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java @@ -403,7 +403,7 @@ public final class WALPerformanceEvaluation extends Configured implements Tool { TableDescriptorBuilder.newBuilder(TableName.valueOf(TABLE_NAME + ":" + regionNum)); IntStream.range(0, numFamilies) .mapToObj(i -> ColumnFamilyDescriptorBuilder.of(FAMILY_PREFIX + i)) - .forEachOrdered(builder::addColumnFamily); + .forEachOrdered(builder::setColumnFamily); return builder.build(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-shell/src/main/ruby/hbase/admin.rb ---------------------------------------------------------------------- diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb b/hbase-shell/src/main/ruby/hbase/admin.rb index f524380..078477f 100644 --- a/hbase-shell/src/main/ruby/hbase/admin.rb +++ b/hbase-shell/src/main/ruby/hbase/admin.rb @@ -706,6 +706,7 @@ module Hbase next unless k =~ /coprocessor/i v = String.new(value) v.strip! + # TODO: We should not require user to config the coprocessor with our inner format. htd.addCoprocessorWithSpec(v) valid_coproc_keys << key end
