http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/CoprocessorWhitelistMasterObserver.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/CoprocessorWhitelistMasterObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/CoprocessorWhitelistMasterObserver.java index 44a4f57..44f736b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/CoprocessorWhitelistMasterObserver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/CoprocessorWhitelistMasterObserver.java @@ -21,21 +21,17 @@ package org.apache.hadoop.hbase.security.access; import java.io.IOException; import java.util.Collection; import java.util.Optional; -import java.util.regex.Matcher; - import org.apache.commons.io.FilenameUtils; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseInterfaceAudience; -import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.CoprocessorDescriptor; import org.apache.hadoop.hbase.client.RegionInfo; import org.apache.hadoop.hbase.client.TableDescriptor; import org.apache.hadoop.hbase.coprocessor.MasterCoprocessor; import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment; import org.apache.hadoop.hbase.coprocessor.MasterObserver; import org.apache.hadoop.hbase.coprocessor.ObserverContext; -import org.apache.hadoop.hbase.util.Bytes; import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -81,10 +77,8 @@ public class CoprocessorWhitelistMasterObserver implements MasterCoprocessor, Ma * "file:///usr/hbase/coprocessors" or for all * filesystems "/usr/hbase/coprocessors") * @return if the path was found under the wlPath - * @throws IOException if a failure occurs in getting the path file system */ - private static boolean validatePath(Path coprocPath, Path wlPath, - Configuration conf) throws IOException { + private static boolean validatePath(Path coprocPath, Path wlPath) { // verify if all are allowed if (wlPath.toString().equals("*")) { return(true); @@ -143,58 +137,26 @@ public class CoprocessorWhitelistMasterObserver implements MasterCoprocessor, Ma * @param ctx as passed in from the coprocessor * @param htd as passed in from the coprocessor */ - private void verifyCoprocessors(ObserverContext<MasterCoprocessorEnvironment> ctx, + private static void verifyCoprocessors(ObserverContext<MasterCoprocessorEnvironment> ctx, TableDescriptor htd) throws IOException { - - Configuration conf = ctx.getEnvironment().getConfiguration(); - Collection<String> paths = - conf.getStringCollection( + ctx.getEnvironment().getConfiguration().getStringCollection( CP_COPROCESSOR_WHITELIST_PATHS_KEY); - - Collection<String> coprocs = htd.getCoprocessors(); - for (int i = 0; i < coprocs.size(); i++) { - - String coprocSpec = Bytes.toString(htd.getValue( - Bytes.toBytes("coprocessor$" + (i + 1)))); - if (coprocSpec == null) { - continue; - } - - // File path is the 1st field of the coprocessor spec - Matcher matcher = - HConstants.CP_HTD_ATTR_VALUE_PATTERN.matcher(coprocSpec); - if (matcher == null || !matcher.matches()) { - continue; - } - - String coprocPathStr = matcher.group(1).trim(); - // Check if coprocessor is being loaded via the classpath (i.e. no file path) - if (coprocPathStr.equals("")) { - break; - } - Path coprocPath = new Path(coprocPathStr); - String coprocessorClass = matcher.group(2).trim(); - - boolean foundPathMatch = false; - for (String pathStr : paths) { - Path wlPath = new Path(pathStr); - try { - foundPathMatch = validatePath(coprocPath, wlPath, conf); - if (foundPathMatch == true) { + for (CoprocessorDescriptor cp : htd.getCoprocessorDescriptors()) { + if (cp.getJarPath().isPresent()) { + if (paths.stream().noneMatch(p -> { + Path wlPath = new Path(p); + if (validatePath(new Path(cp.getJarPath().get()), wlPath)) { LOG.debug(String.format("Coprocessor %s found in directory %s", - coprocessorClass, pathStr)); - break; + cp.getClassName(), p)); + return true; } - } catch (IOException e) { - LOG.warn(String.format("Failed to validate white list path %s for coprocessor path %s", - pathStr, coprocPathStr)); + return false; + })) { + throw new IOException(String.format("Loading %s DENIED in %s", + cp.getClassName(), CP_COPROCESSOR_WHITELIST_PATHS_KEY)); } } - if (!foundPathMatch) { - throw new IOException(String.format("Loading %s DENIED in %s", - coprocessorClass, CP_COPROCESSOR_WHITELIST_PATHS_KEY)); - } } } }
http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java index e6b64b4..e027ac6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java @@ -873,7 +873,7 @@ public class LoadIncrementalHFiles extends Configured implements Tool { byte[][] keys = inferBoundaries(map); TableDescriptorBuilder tdBuilder = TableDescriptorBuilder.newBuilder(tableName); familyBuilders.stream().map(ColumnFamilyDescriptorBuilder::build) - .forEachOrdered(tdBuilder::addColumnFamily); + .forEachOrdered(tdBuilder::setColumnFamily); admin.createTable(tdBuilder.build(), keys); LOG.info("Table " + tableName + " is available!!"); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java index ab48313..28c7ec3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java @@ -37,6 +37,8 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.PathFilter; +import org.apache.hadoop.hbase.client.CoprocessorDescriptorBuilder; +import org.apache.hadoop.hbase.coprocessor.MultiRowMutationEndpoint; import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -149,35 +151,36 @@ public class FSTableDescriptors implements TableDescriptors { // the META table data goes to File mode BC only. Test how that affect the system. If too much, // we have to rethink about adding back the setCacheDataInL1 for META table CFs. return TableDescriptorBuilder.newBuilder(TableName.META_TABLE_NAME) - .addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(HConstants.CATALOG_FAMILY) - .setMaxVersions(conf.getInt(HConstants.HBASE_META_VERSIONS, - HConstants.DEFAULT_HBASE_META_VERSIONS)) - .setInMemory(true) - .setBlocksize(conf.getInt(HConstants.HBASE_META_BLOCK_SIZE, - HConstants.DEFAULT_HBASE_META_BLOCK_SIZE)) - .setScope(HConstants.REPLICATION_SCOPE_LOCAL) - // Disable blooms for meta. Needs work. Seems to mess w/ getClosestOrBefore. - .setBloomFilterType(BloomType.NONE) - .build()) - .addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(HConstants.TABLE_FAMILY) - .setMaxVersions(conf.getInt(HConstants.HBASE_META_VERSIONS, - HConstants.DEFAULT_HBASE_META_VERSIONS)) - .setInMemory(true) - .setBlocksize(8 * 1024) - .setScope(HConstants.REPLICATION_SCOPE_LOCAL) - // Disable blooms for meta. Needs work. Seems to mess w/ getClosestOrBefore. - .setBloomFilterType(BloomType.NONE) - .build()) - .addColumnFamily(ColumnFamilyDescriptorBuilder - .newBuilder(HConstants.REPLICATION_BARRIER_FAMILY) - .setMaxVersions(HConstants.ALL_VERSIONS) - .setInMemory(true) - .setScope(HConstants.REPLICATION_SCOPE_LOCAL) - // Disable blooms for meta. Needs work. Seems to mess w/ getClosestOrBefore. - .setBloomFilterType(BloomType.NONE) - .build()) - .addCoprocessor("org.apache.hadoop.hbase.coprocessor.MultiRowMutationEndpoint", - null, Coprocessor.PRIORITY_SYSTEM, null); + .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(HConstants.CATALOG_FAMILY) + .setMaxVersions(conf.getInt(HConstants.HBASE_META_VERSIONS, + HConstants.DEFAULT_HBASE_META_VERSIONS)) + .setInMemory(true) + .setBlocksize(conf.getInt(HConstants.HBASE_META_BLOCK_SIZE, + HConstants.DEFAULT_HBASE_META_BLOCK_SIZE)) + .setScope(HConstants.REPLICATION_SCOPE_LOCAL) + // Disable blooms for meta. Needs work. Seems to mess w/ getClosestOrBefore. + .setBloomFilterType(BloomType.NONE) + .build()) + .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(HConstants.TABLE_FAMILY) + .setMaxVersions(conf.getInt(HConstants.HBASE_META_VERSIONS, + HConstants.DEFAULT_HBASE_META_VERSIONS)) + .setInMemory(true) + .setBlocksize(8 * 1024) + .setScope(HConstants.REPLICATION_SCOPE_LOCAL) + // Disable blooms for meta. Needs work. Seems to mess w/ getClosestOrBefore. + .setBloomFilterType(BloomType.NONE) + .build()) + .setColumnFamily(ColumnFamilyDescriptorBuilder + .newBuilder(HConstants.REPLICATION_BARRIER_FAMILY) + .setMaxVersions(HConstants.ALL_VERSIONS) + .setInMemory(true) + .setScope(HConstants.REPLICATION_SCOPE_LOCAL) + // Disable blooms for meta. Needs work. Seems to mess w/ getClosestOrBefore. + .setBloomFilterType(BloomType.NONE) + .build()) + .setCoprocessor(CoprocessorDescriptorBuilder.newBuilder( + MultiRowMutationEndpoint.class.getName()) + .setPriority(Coprocessor.PRIORITY_SYSTEM).build()); } @VisibleForTesting http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java index a2b3e45..7a2bd00 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java @@ -1380,7 +1380,7 @@ public class HBaseFsck extends Configured implements Closeable { if (columns ==null || columns.isEmpty()) return false; TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName); for (String columnfamimly : columns) { - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(columnfamimly)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(columnfamimly)); } fstd.createTableDescriptor(builder.build(), true); return true; http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java index 75b8ccd..7d3bc42 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java @@ -402,7 +402,7 @@ public class RegionSplitter { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName); for (String cf : columnFamilies) { - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(cf)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(cf)); } try (Connection connection = ConnectionFactory.createConnection(conf)) { Admin admin = connection.getAdmin(); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/AcidGuaranteesTestBase.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/AcidGuaranteesTestBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/AcidGuaranteesTestBase.java index c0aa1a0..d84dd59 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/AcidGuaranteesTestBase.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/AcidGuaranteesTestBase.java @@ -76,7 +76,7 @@ public abstract class AcidGuaranteesTestBase { builder.setValue(CompactingMemStore.IN_MEMORY_FLUSH_THRESHOLD_FACTOR_KEY, "0.9"); } Stream.of(FAMILIES).map(ColumnFamilyDescriptorBuilder::of) - .forEachOrdered(builder::addColumnFamily); + .forEachOrdered(builder::setColumnFamily); UTIL.getAdmin().createTable(builder.build()); tool.setConf(UTIL.getConfiguration()); } http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/AcidGuaranteesTestTool.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/AcidGuaranteesTestTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/AcidGuaranteesTestTool.java index 44d3e87..4265d50 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/AcidGuaranteesTestTool.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/AcidGuaranteesTestTool.java @@ -320,7 +320,7 @@ public class AcidGuaranteesTestTool extends AbstractHBaseTool { if (!admin.tableExists(TABLE_NAME)) { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(TABLE_NAME); Stream.of(FAMILIES).map(ColumnFamilyDescriptorBuilder::of) - .forEachOrdered(builder::addColumnFamily); + .forEachOrdered(builder::setColumnFamily); admin.createTable(builder.build()); } ColumnFamilyDescriptor cfd = admin.getDescriptor(TABLE_NAME).getColumnFamilies()[0]; http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java index b48abc6..3c3cb0a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java @@ -1409,7 +1409,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility { BloomType type, int blockSize, Configuration c) throws IOException { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(htd); for (byte[] family : families) { - builder.addColumnFamily( + builder.setColumnFamily( ColumnFamilyDescriptorBuilder.newBuilder(family).setBloomFilterType(type) .setBlocksize(blockSize).build()); } @@ -3752,7 +3752,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(td); for (ColumnFamilyDescriptor cd : cds) { if (!td.hasColumnFamily(cd.getName())) { - builder.addColumnFamily(cd); + builder.setColumnFamily(cd); } } td = builder.build(); @@ -3858,7 +3858,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility { throws IOException { TableDescriptor td = TableDescriptorBuilder.newBuilder(TableName.valueOf(tableName)) - .addColumnFamily(cd) + .setColumnFamily(cd) .build(); HRegionInfo info = new HRegionInfo(TableName.valueOf(tableName), null, null, false); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java index c1735a7..2d57954 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java @@ -143,7 +143,7 @@ public class TestZooKeeper { private void testSanity(final String testName) throws Exception { String tableName = testName + "_" + System.currentTimeMillis(); TableDescriptor desc = TableDescriptorBuilder.newBuilder(TableName.valueOf(tableName)) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of("fam")).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of("fam")).build(); LOG.info("Creating table " + tableName); Admin admin = TEST_UTIL.getAdmin(); try { @@ -179,7 +179,7 @@ public class TestZooKeeper { Bytes.toBytes("g"), Bytes.toBytes("h"), Bytes.toBytes("i"), Bytes.toBytes("j") }; TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName())) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(HConstants.CATALOG_FAMILY)).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(HConstants.CATALOG_FAMILY)).build(); admin.createTable(htd, SPLIT_KEYS); TEST_UTIL.waitUntilNoRegionsInTransition(60000); m.getZooKeeper().close(); @@ -241,7 +241,7 @@ public class TestZooKeeper { byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes("1"), Bytes.toBytes("2"), Bytes.toBytes("3"), Bytes.toBytes("4"), Bytes.toBytes("5") }; TableDescriptor htd = TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(family)).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(family)).build(); admin.createTable(htd, SPLIT_KEYS); } TEST_UTIL.waitUntilNoRegionsInTransition(60000); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestCIOperationTimeout.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestCIOperationTimeout.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestCIOperationTimeout.java index d084741..d109108 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestCIOperationTimeout.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestCIOperationTimeout.java @@ -40,8 +40,8 @@ public abstract class AbstractTestCIOperationTimeout extends AbstractTestCITimeo public void setUp() throws IOException { tableName = TableName.valueOf(name.getMethodName()); TableDescriptor htd = TableDescriptorBuilder.newBuilder(tableName) - .addCoprocessor(SleepAndFailFirstTime.class.getName()) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAM_NAM)).build(); + .setCoprocessor(SleepAndFailFirstTime.class.getName()) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAM_NAM)).build(); TEST_UTIL.getAdmin().createTable(htd); } http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestCIRpcTimeout.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestCIRpcTimeout.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestCIRpcTimeout.java index e052202..89696cf 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestCIRpcTimeout.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestCIRpcTimeout.java @@ -41,8 +41,8 @@ public abstract class AbstractTestCIRpcTimeout extends AbstractTestCITimeout { public void setUp() throws IOException { tableName = TableName.valueOf(name.getMethodName()); TableDescriptor htd = - TableDescriptorBuilder.newBuilder(tableName).addCoprocessor(SleepCoprocessor.class.getName()) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAM_NAM)).build(); + TableDescriptorBuilder.newBuilder(tableName).setCoprocessor(SleepCoprocessor.class.getName()) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAM_NAM)).build(); TEST_UTIL.getAdmin().createTable(htd); } http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java index 525fa4c..da86418 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java @@ -129,7 +129,7 @@ public abstract class TestAsyncAdminBase { byte[]... families) { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName); for (byte[] family : families) { - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(family)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(family)); } CompletableFuture<Void> future = splitKeys == null ? admin.createTable(builder.build()) : admin.createTable(builder.build(), splitKeys); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java index b70d8c0..6c34c1f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java @@ -313,7 +313,7 @@ public class TestAsyncClusterAdminApi extends TestAsyncAdminBase { private void createAndLoadTable(TableName[] tables) { for (TableName table : tables) { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(table); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)); admin.createTable(builder.build(), Bytes.toBytes("aaaaa"), Bytes.toBytes("zzzzz"), 16).join(); AsyncTable<?> asyncTable = ASYNC_CONN.getTable(table); List<Put> puts = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java index 762dbd1..1a156ec 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java @@ -47,7 +47,6 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.JVMClusterUtil; import org.apache.hadoop.hbase.util.Threads; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -106,7 +105,7 @@ public class TestAsyncRegionAdminApi extends TestAsyncAdminBase { throws IOException, InterruptedException, ExecutionException { TableDescriptor desc = TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)).build(); admin.createTable(desc, Bytes.toBytes("A"), Bytes.toBytes("Z"), 5).get(); // wait till the table is assigned @@ -262,7 +261,7 @@ public class TestAsyncRegionAdminApi extends TestAsyncAdminBase { .setMobEnabled(true).setMobThreshold(0).build(); TableDescriptor tableDescriptor = TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(columnDescriptor).build(); + .setColumnFamily(columnDescriptor).build(); admin.createTable(tableDescriptor).get(); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApiWithClusters.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApiWithClusters.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApiWithClusters.java index 0dc2b38..b22caa2 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApiWithClusters.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApiWithClusters.java @@ -111,7 +111,7 @@ public class TestAsyncReplicationAdminApiWithClusters extends TestAsyncAdminBase private void createTableWithDefaultConf(AsyncAdmin admin, TableName tableName) { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)); admin.createTable(builder.build()).join(); } @@ -147,7 +147,7 @@ public class TestAsyncReplicationAdminApiWithClusters extends TestAsyncAdminBase createTableWithDefaultConf(admin2, tableName); TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(admin.getDescriptor(tableName).get()); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes("newFamily")) + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes("newFamily")) .build()); admin2.disableTable(tableName).join(); admin2.modifyTable(builder.build()).join(); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi.java index bc3a651..2c948dd 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi.java @@ -97,7 +97,7 @@ public class TestAsyncTableAdminApi extends TestAsyncAdminBase { final TableName tableName3 = TableName.valueOf(tableName.getNameAsString() + "_3"); TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName3); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)); admin.createTable(builder.build(), "a".getBytes(), "z".getBytes(), 3).join(); regionLocations = AsyncMetaTableAccessor.getTableHRegionLocations(metaTable, Optional.of(tableName3)).get(); @@ -105,7 +105,7 @@ public class TestAsyncTableAdminApi extends TestAsyncAdminBase { final TableName tableName4 = TableName.valueOf(tableName.getNameAsString() + "_4"); builder = TableDescriptorBuilder.newBuilder(tableName4); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)); try { admin.createTable(builder.build(), "a".getBytes(), "z".getBytes(), 2).join(); fail("Should not be able to create a table with only 2 regions using this API."); @@ -115,7 +115,7 @@ public class TestAsyncTableAdminApi extends TestAsyncAdminBase { final TableName tableName5 = TableName.valueOf(tableName.getNameAsString() + "_5"); builder = TableDescriptorBuilder.newBuilder(tableName5); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)); admin.createTable(builder.build(), new byte[] { 1 }, new byte[] { 127 }, 16).join(); regionLocations = AsyncMetaTableAccessor.getTableHRegionLocations(metaTable, Optional.of(tableName5)).get(); @@ -191,7 +191,7 @@ public class TestAsyncTableAdminApi extends TestAsyncAdminBase { expectedRegions = 10; final TableName tableName2 = TableName.valueOf(tableName.getNameAsString() + "_2"); TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName2); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)); admin.createTable(builder.build(), startKey, endKey, expectedRegions).join(); regions = @@ -244,7 +244,7 @@ public class TestAsyncTableAdminApi extends TestAsyncAdminBase { expectedRegions = 5; final TableName tableName3 = TableName.valueOf(tableName.getNameAsString() + "_3"); builder = TableDescriptorBuilder.newBuilder(tableName3); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)); admin.createTable(builder.build(), startKey, endKey, expectedRegions).join(); regions = http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi2.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi2.java index 180f95b..63ff3e4 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi2.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi2.java @@ -70,7 +70,7 @@ public class TestAsyncTableAdminApi2 extends TestAsyncAdminBase { public void testAddColumnFamily() throws Exception { // Create a table with two families TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY_0)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY_0)); admin.createTable(builder.build()).join(); admin.disableTable(tableName).join(); // Verify the table descriptor @@ -85,7 +85,7 @@ public class TestAsyncTableAdminApi2 extends TestAsyncAdminBase { public void testAddSameColumnFamilyTwice() throws Exception { // Create a table with one families TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY_0)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY_0)); admin.createTable(builder.build()).join(); admin.disableTable(tableName).join(); // Verify the table descriptor @@ -109,7 +109,7 @@ public class TestAsyncTableAdminApi2 extends TestAsyncAdminBase { TableDescriptorBuilder tdBuilder = TableDescriptorBuilder.newBuilder(tableName); ColumnFamilyDescriptor cfd = ColumnFamilyDescriptorBuilder.of(FAMILY_0); int blockSize = cfd.getBlocksize(); - admin.createTable(tdBuilder.addColumnFamily(cfd).build()).join(); + admin.createTable(tdBuilder.setColumnFamily(cfd).build()).join(); admin.disableTable(tableName).join(); // Verify the table descriptor verifyTableDescriptor(tableName, FAMILY_0); @@ -129,7 +129,7 @@ public class TestAsyncTableAdminApi2 extends TestAsyncAdminBase { TableDescriptorBuilder tdBuilder = TableDescriptorBuilder.newBuilder(tableName); ColumnFamilyDescriptor cfd = ColumnFamilyDescriptorBuilder.of(FAMILY_0); int blockSize = cfd.getBlocksize(); - admin.createTable(tdBuilder.addColumnFamily(cfd).build()).join(); + admin.createTable(tdBuilder.setColumnFamily(cfd).build()).join(); admin.disableTable(tableName).join(); // Verify the table descriptor verifyTableDescriptor(tableName, FAMILY_0); @@ -150,8 +150,8 @@ public class TestAsyncTableAdminApi2 extends TestAsyncAdminBase { public void testDeleteColumnFamily() throws Exception { // Create a table with two families TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY_0)) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY_1)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY_0)) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY_1)); admin.createTable(builder.build()).join(); admin.disableTable(tableName).join(); // Verify the table descriptor @@ -166,8 +166,8 @@ public class TestAsyncTableAdminApi2 extends TestAsyncAdminBase { public void testDeleteSameColumnFamilyTwice() throws Exception { // Create a table with two families TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY_0)) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY_1)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY_0)) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY_1)); admin.createTable(builder.build()).join(); admin.disableTable(tableName).join(); // Verify the table descriptor http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi3.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi3.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi3.java index 84009c0..07c8d77 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi3.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi3.java @@ -120,7 +120,7 @@ public class TestAsyncTableAdminApi3 extends TestAsyncAdminBase { byte[][] families = { FAMILY, FAMILY_0, FAMILY_1 }; TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName); for (byte[] family : families) { - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(family)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(family)); } TableDescriptor desc = builder.build(); admin.createTable(desc).join(); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableBatch.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableBatch.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableBatch.java index 5c76381..3a7614b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableBatch.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableBatch.java @@ -268,7 +268,7 @@ public class TestAsyncTableBatch { public void testPartialSuccess() throws IOException, InterruptedException, ExecutionException { Admin admin = TEST_UTIL.getAdmin(); TableDescriptor htd = TableDescriptorBuilder.newBuilder(admin.getDescriptor(TABLE_NAME)) - .addCoprocessor(ErrorInjectObserver.class.getName()).build(); + .setCoprocessor(ErrorInjectObserver.class.getName()).build(); admin.modifyTable(htd); AsyncTable<?> table = tableGetter.apply(TABLE_NAME); table.putAll(Arrays.asList(SPLIT_KEYS).stream().map(k -> new Put(k).addColumn(FAMILY, CQ, k)) http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCISleep.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCISleep.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCISleep.java index 761922a..4e5665d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCISleep.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCISleep.java @@ -58,10 +58,11 @@ public class TestCISleep extends AbstractTestCITimeout { @Test public void testRpcRetryingCallerSleep() throws Exception { TableDescriptor htd = TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAM_NAM)) - .addCoprocessorWithSpec("|" + SleepAndFailFirstTime.class.getName() + "||" + - SleepAndFailFirstTime.SLEEP_TIME_CONF_KEY + "=2000") - .build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAM_NAM)) + .setCoprocessor(CoprocessorDescriptorBuilder.newBuilder(SleepAndFailFirstTime.class.getName()) + .setProperty(SleepAndFailFirstTime.SLEEP_TIME_CONF_KEY, String.valueOf(2000)) + .build()) + .build(); TEST_UTIL.getAdmin().createTable(htd); Configuration c = new Configuration(TEST_UTIL.getConfiguration()); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestDropTimeoutRequest.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestDropTimeoutRequest.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestDropTimeoutRequest.java index 6b59fde..b8ebccd 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestDropTimeoutRequest.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestDropTimeoutRequest.java @@ -114,9 +114,9 @@ public class TestDropTimeoutRequest { // on handling timeout requests and finally all requests timeout and client throws exception. TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName())); - builder.addCoprocessor(SleepLongerAtFirstCoprocessor.class.getName()); + builder.setCoprocessor(SleepLongerAtFirstCoprocessor.class.getName()); ColumnFamilyDescriptor cfd = ColumnFamilyDescriptorBuilder.newBuilder(FAM_NAM).build(); - builder.addColumnFamily(cfd); + builder.setColumnFamily(cfd); TableDescriptor td = builder.build(); try (Admin admin = TEST_UTIL.getConnection().getAdmin()) { admin.createTable(td); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java index 82cf802..24591c0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java @@ -184,7 +184,7 @@ public class TestFromClientSide3 { public void testScanAfterDeletingSpecifiedRow() throws IOException { TableName tableName = TableName.valueOf(name.getMethodName()); TableDescriptor desc = TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)) .build(); TEST_UTIL.getAdmin().createTable(desc); byte[] row = Bytes.toBytes("SpecifiedRow"); @@ -231,7 +231,7 @@ public class TestFromClientSide3 { public void testScanAfterDeletingSpecifiedRowV2() throws IOException { TableName tableName = TableName.valueOf(name.getMethodName()); TableDescriptor desc = TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)) .build(); TEST_UTIL.getAdmin().createTable(desc); byte[] row = Bytes.toBytes("SpecifiedRow"); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMalformedCellFromClient.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMalformedCellFromClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMalformedCellFromClient.java index 6b57b89..6305fa1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMalformedCellFromClient.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMalformedCellFromClient.java @@ -83,7 +83,7 @@ public class TestMalformedCellFromClient { @Before public void before() throws Exception { TableDescriptor desc = TableDescriptorBuilder.newBuilder(TABLE_NAME) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)) .setValue(HRegion.HBASE_MAX_CELL_SIZE_KEY, String.valueOf(CELL_SIZE)).build(); TEST_UTIL.getConnection().getAdmin().createTable(desc); } http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java index 046b6f8..59920d6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java @@ -317,8 +317,8 @@ public class TestReplicaWithCluster { public void testChangeTable() throws Exception { TableDescriptor td = TableDescriptorBuilder.newBuilder(TableName.valueOf("testChangeTable")) .setRegionReplication(NB_SERVERS) - .addCoprocessor(SlowMeCopro.class.getName()) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(f)) + .setCoprocessor(SlowMeCopro.class.getName()) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(f)) .build(); HTU.getAdmin().createTable(td); Table table = HTU.getConnection().getTable(td.getTableName()); @@ -334,7 +334,7 @@ public class TestReplicaWithCluster { // Add a CF, it should work. TableDescriptor bHdt = HTU.getAdmin().getDescriptor(td.getTableName()); td = TableDescriptorBuilder.newBuilder(td) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(row)) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(row)) .build(); HTU.getAdmin().disableTable(td.getTableName()); HTU.getAdmin().modifyTable(td); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResultFromCoprocessor.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResultFromCoprocessor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResultFromCoprocessor.java index c5be7cd..27522f5 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResultFromCoprocessor.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResultFromCoprocessor.java @@ -63,8 +63,8 @@ public class TestResultFromCoprocessor { public static void setUpBeforeClass() throws Exception { TEST_UTIL.startMiniCluster(3); TableDescriptor desc = TableDescriptorBuilder.newBuilder(TABLE_NAME) - .addCoprocessor(MyObserver.class.getName()) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)) + .setCoprocessor(MyObserver.class.getName()) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)) .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/client/TestServerLoadDurability.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestServerLoadDurability.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestServerLoadDurability.java index 38c3d3a..267e9e8 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestServerLoadDurability.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestServerLoadDurability.java @@ -117,7 +117,7 @@ public class TestServerLoadDurability { private void createTableWithDefaultConf(TableName tableName) throws IOException { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)); admin.createTable(builder.build()); } http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoreRegionCoprocessor.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoreRegionCoprocessor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoreRegionCoprocessor.java index 8e6ebf3..ceb6b5c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoreRegionCoprocessor.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoreRegionCoprocessor.java @@ -67,7 +67,7 @@ public class TestCoreRegionCoprocessor { String methodName = this.name.getMethodName(); TableName tn = TableName.valueOf(methodName); ColumnFamilyDescriptor cfd = ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes(methodName)).build(); - TableDescriptor td = TableDescriptorBuilder.newBuilder(tn).addColumnFamily(cfd).build(); + TableDescriptor td = TableDescriptorBuilder.newBuilder(tn).setColumnFamily(cfd).build(); RegionInfo ri = RegionInfoBuilder.newBuilder(tn).build(); this.rss = new MockRegionServerServices(HTU.getConfiguration()); this.region = HRegion.openHRegion(ri, td, null, HTU.getConfiguration(), this.rss, null); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestPassCustomCellViaRegionObserver.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestPassCustomCellViaRegionObserver.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestPassCustomCellViaRegionObserver.java index 282d5dc..fcfd4f6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestPassCustomCellViaRegionObserver.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestPassCustomCellViaRegionObserver.java @@ -112,8 +112,8 @@ public class TestPassCustomCellViaRegionObserver { admin.deleteTable(name); } table = UTIL.createTable(TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)) - .addCoprocessor(RegionObserverImpl.class.getName()) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)) + .setCoprocessor(RegionObserverImpl.class.getName()) .build(), null); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java index 3ee7020..c8cb805 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java @@ -485,14 +485,14 @@ public class TestWALObserver { private TableDescriptor getBasic3FamilyHTableDescriptor(TableName tableName) { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName); Arrays.stream(TEST_FAMILY).map(ColumnFamilyDescriptorBuilder::of) - .forEachOrdered(builder::addColumnFamily); + .forEachOrdered(builder::setColumnFamily); return builder.build(); } private TableDescriptor createBasic3FamilyHTD(String tableName) { return TableDescriptorBuilder.newBuilder(TableName.valueOf(tableName)) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of("a")) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of("b")) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of("c")).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of("a")) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of("b")) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of("c")).build(); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java index cee7a4a..4aa97d3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java @@ -28,6 +28,7 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; +import org.apache.hadoop.hbase.client.CoprocessorDescriptorBuilder; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.TableDescriptor; @@ -126,9 +127,14 @@ public class TestAssignmentManagerMetrics { // alter table with a non-existing coprocessor - String spec = "hdfs:///foo.jar|com.foo.FooRegionObserver|1001|arg1=1,arg2=2"; TableDescriptor htd = TableDescriptorBuilder.newBuilder(TABLENAME) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)).addCoprocessorWithSpec(spec) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)) + .setCoprocessor(CoprocessorDescriptorBuilder.newBuilder("com.foo.FooRegionObserver") + .setJarPath("hdfs:///foo.jar") + .setPriority(1001) + .setProperty("arg1", "1") + .setProperty("arg2", "2") + .build()) .build(); try { TEST_UTIL.getAdmin().modifyTable(htd); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java index b665f32..b8a53b6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java @@ -173,7 +173,7 @@ public class TestCatalogJanitor { */ private TableDescriptor createTableDescriptorForCurrentMethod() { return TableDescriptorBuilder.newBuilder(TableName.valueOf(this.name.getMethodName())). - addColumnFamily(new HColumnDescriptor(MockMasterServices.DEFAULT_COLUMN_FAMILY_NAME)). + setColumnFamily(new HColumnDescriptor(MockMasterServices.DEFAULT_COLUMN_FAMILY_NAME)). build(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java index 346abba..fb75001 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java @@ -342,7 +342,7 @@ public class MockMasterServices extends MockNoopMasterServices { @Override public TableDescriptor get(TableName tablename) throws IOException { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tablename); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(DEFAULT_COLUMN_FAMILY_NAME)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(DEFAULT_COLUMN_FAMILY_NAME)); return builder.build(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRogueRSAssignment.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRogueRSAssignment.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRogueRSAssignment.java index f5e4634..afcf446 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRogueRSAssignment.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRogueRSAssignment.java @@ -179,7 +179,7 @@ public class TestRogueRSAssignment { private List<HRegionInfo> createTable(final TableName tableName) throws Exception { TableDescriptorBuilder tdBuilder = TableDescriptorBuilder.newBuilder(tableName); - tdBuilder.addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(FAMILY).build()); + tdBuilder.setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(FAMILY).build()); byte[][] rows = new byte[initialRegionCount - 1][]; for (int i = 0; i < rows.length; ++i) { http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestFavoredStochasticBalancerPickers.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestFavoredStochasticBalancerPickers.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestFavoredStochasticBalancerPickers.java index ece1ee1..0b40ae0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestFavoredStochasticBalancerPickers.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestFavoredStochasticBalancerPickers.java @@ -126,7 +126,7 @@ public class TestFavoredStochasticBalancerPickers extends BalancerTestBase { ColumnFamilyDescriptorBuilder.newBuilder(HConstants.CATALOG_FAMILY).build(); TableDescriptor desc = TableDescriptorBuilder .newBuilder(tableName) - .addColumnFamily(columnFamilyDescriptor) + .setColumnFamily(columnFamilyDescriptor) .build(); admin.createTable(desc, Bytes.toBytes("aaa"), Bytes.toBytes("zzz"), REGIONS); TEST_UTIL.waitUntilAllRegionsAssigned(tableName); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java index 94efcc7..9d76ede 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java @@ -31,7 +31,6 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; @@ -290,7 +289,7 @@ public class TestSnapshotFromMaster { // snapshot, the call after snapshot will be a no-op and checks will fail UTIL.deleteTable(TABLE_NAME); TableDescriptor td = TableDescriptorBuilder.newBuilder(TABLE_NAME) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(TEST_FAM)) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(TEST_FAM)) .setCompactionEnabled(false) .build(); UTIL.getAdmin().createTable(td); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java index c8bb97d..785e85f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java @@ -145,7 +145,7 @@ public class MasterProcedureTestingUtility { public static TableDescriptor createHTD(final TableName tableName, final String... family) { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName); for (int i = 0; i < family.length; ++i) { - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(family[i])); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(family[i])); } return builder.build(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterObserverPostCalls.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterObserverPostCalls.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterObserverPostCalls.java index 65033a3..e635710 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterObserverPostCalls.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterObserverPostCalls.java @@ -148,7 +148,7 @@ public class TestMasterObserverPostCalls { admin.createNamespace(NamespaceDescriptor.create(ns).build()); admin.createTable(TableDescriptorBuilder.newBuilder(tn1) - .addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes("f1")).build()) + .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes("f1")).build()) .build()); HMaster master = UTIL.getMiniHBaseCluster().getMaster(); @@ -239,7 +239,7 @@ public class TestMasterObserverPostCalls { public void testPostCreateTable() throws IOException { final Admin admin = UTIL.getAdmin(); final TableName tn = TableName.valueOf("postcreatetable"); - final TableDescriptor td = TableDescriptorBuilder.newBuilder(tn).addColumnFamily( + final TableDescriptor td = TableDescriptorBuilder.newBuilder(tn).setColumnFamily( ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes("f1")).build()).build(); HMaster master = UTIL.getMiniHBaseCluster().getMaster(); @@ -269,7 +269,7 @@ public class TestMasterObserverPostCalls { public void testPostModifyTable() throws IOException { final Admin admin = UTIL.getAdmin(); final TableName tn = TableName.valueOf("postmodifytable"); - final TableDescriptor td = TableDescriptorBuilder.newBuilder(tn).addColumnFamily( + final TableDescriptor td = TableDescriptorBuilder.newBuilder(tn).setColumnFamily( ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes("f1")).build()).build(); HMaster master = UTIL.getMiniHBaseCluster().getMaster(); @@ -289,7 +289,7 @@ public class TestMasterObserverPostCalls { preCount = observer.postHookCalls.get(); try { admin.modifyTable(TableDescriptorBuilder.newBuilder(TableName.valueOf("missing")) - .addColumnFamily(td.getColumnFamily(Bytes.toBytes("f1"))).build()); + .setColumnFamily(td.getColumnFamily(Bytes.toBytes("f1"))).build()); fail("Modifying a missing table should fail"); } catch (IOException e) { // Pass @@ -303,7 +303,7 @@ public class TestMasterObserverPostCalls { public void testPostDisableTable() throws IOException { final Admin admin = UTIL.getAdmin(); final TableName tn = TableName.valueOf("postdisabletable"); - final TableDescriptor td = TableDescriptorBuilder.newBuilder(tn).addColumnFamily( + final TableDescriptor td = TableDescriptorBuilder.newBuilder(tn).setColumnFamily( ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes("f1")).build()).build(); HMaster master = UTIL.getMiniHBaseCluster().getMaster(); @@ -336,7 +336,7 @@ public class TestMasterObserverPostCalls { public void testPostDeleteTable() throws IOException { final Admin admin = UTIL.getAdmin(); final TableName tn = TableName.valueOf("postdeletetable"); - final TableDescriptor td = TableDescriptorBuilder.newBuilder(tn).addColumnFamily( + final TableDescriptor td = TableDescriptorBuilder.newBuilder(tn).setColumnFamily( ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes("f1")).build()).build(); HMaster master = UTIL.getMiniHBaseCluster().getMaster(); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedurePriority.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedurePriority.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedurePriority.java index 05d8976..9f5741c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedurePriority.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedurePriority.java @@ -115,7 +115,7 @@ public class TestProcedurePriority { for (int i = 0; i < TABLE_COUNT; i++) { futures.add(UTIL.getAdmin().createTableAsync( TableDescriptorBuilder.newBuilder(TableName.valueOf(TABLE_NAME_PREFIX + i)) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(CF)).build(), + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(CF)).build(), null)); } for (Future<?> future : futures) { http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/SpaceQuotaHelperForTests.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/SpaceQuotaHelperForTests.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/SpaceQuotaHelperForTests.java index a10e3a2..a9a0822 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/SpaceQuotaHelperForTests.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/SpaceQuotaHelperForTests.java @@ -325,7 +325,7 @@ public class SpaceQuotaHelperForTests { // Create the table TableDescriptor tableDesc = TableDescriptorBuilder.newBuilder(tn) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(F1)).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(F1)).build(); if (numRegions == 1) { admin.createTable(tableDesc); } else { @@ -347,7 +347,7 @@ public class SpaceQuotaHelperForTests { // Create the table TableDescriptor tableDesc = TableDescriptorBuilder.newBuilder(tn) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(F1)).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(F1)).build(); admin.createTable(tableDesc); return tn; http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestFileArchiverNotifierImpl.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestFileArchiverNotifierImpl.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestFileArchiverNotifierImpl.java index e139e4f..76bb722 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestFileArchiverNotifierImpl.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestFileArchiverNotifierImpl.java @@ -129,7 +129,7 @@ public class TestFileArchiverNotifierImpl { admin.disableTable(tn); admin.deleteTable(tn); } - TableDescriptor desc = TableDescriptorBuilder.newBuilder(tn).addColumnFamily( + TableDescriptor desc = TableDescriptorBuilder.newBuilder(tn).setColumnFamily( ColumnFamilyDescriptorBuilder.of(QuotaTableUtil.QUOTA_FAMILY_USAGE)).build(); admin.createTable(desc); @@ -229,9 +229,9 @@ public class TestFileArchiverNotifierImpl { admin.disableTable(fakeQuotaTableName); admin.deleteTable(fakeQuotaTableName); } - TableDescriptor desc = TableDescriptorBuilder.newBuilder(fakeQuotaTableName).addColumnFamily( + TableDescriptor desc = TableDescriptorBuilder.newBuilder(fakeQuotaTableName).setColumnFamily( ColumnFamilyDescriptorBuilder.of(QuotaTableUtil.QUOTA_FAMILY_USAGE)) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(QuotaUtil.QUOTA_FAMILY_INFO)).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(QuotaUtil.QUOTA_FAMILY_INFO)).build(); admin.createTable(desc); final String ns = ""; http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreRegionReports.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreRegionReports.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreRegionReports.java index 7391fa1..c1b086b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreRegionReports.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaObserverChoreRegionReports.java @@ -104,7 +104,7 @@ public class TestQuotaObserverChoreRegionReports { // Create a table final TableName tn = TableName.valueOf("reportExpiration"); - TableDescriptor tableDesc = TableDescriptorBuilder.newBuilder(tn).addColumnFamily( + TableDescriptor tableDesc = TableDescriptorBuilder.newBuilder(tn).setColumnFamily( ColumnFamilyDescriptorBuilder.of(FAM1)).build(); TEST_UTIL.getAdmin().createTable(tableDesc); @@ -149,7 +149,7 @@ public class TestQuotaObserverChoreRegionReports { // Create a table final TableName tn = TableName.valueOf("quotaAcceptanceWithoutReports"); - TableDescriptor tableDesc = TableDescriptorBuilder.newBuilder(tn).addColumnFamily( + TableDescriptor tableDesc = TableDescriptorBuilder.newBuilder(tn).setColumnFamily( ColumnFamilyDescriptorBuilder.of(FAM1)).build(); TEST_UTIL.getAdmin().createTable(tableDesc); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.java index f26998b..5c73a6f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.java @@ -170,7 +170,7 @@ public class TestCacheOnWriteInSchema { ColumnFamilyDescriptorBuilder.newBuilder(family).setBloomFilterType(BloomType.ROWCOL)) .build(); TableDescriptor htd = - TableDescriptorBuilder.newBuilder(TableName.valueOf(table)).addColumnFamily(hcd).build(); + TableDescriptorBuilder.newBuilder(TableName.valueOf(table)).setColumnFamily(hcd).build(); // Create a store based on the schema String id = TestCacheOnWriteInSchema.class.getName(); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionArchiveConcurrentClose.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionArchiveConcurrentClose.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionArchiveConcurrentClose.java index 225c723..4263de5 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionArchiveConcurrentClose.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionArchiveConcurrentClose.java @@ -94,7 +94,7 @@ public class TestCompactionArchiveConcurrentClose { TableName tableName = TableName.valueOf(name.getMethodName()); TableDescriptor htd = TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(fam)).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(fam)).build(); RegionInfo info = RegionInfoBuilder.newBuilder(tableName).build(); HRegion region = initHRegion(htd, info); RegionServerServices rss = mock(RegionServerServices.class); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionArchiveIOException.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionArchiveIOException.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionArchiveIOException.java index 4c6cf6a..1199c6f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionArchiveIOException.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionArchiveIOException.java @@ -102,7 +102,7 @@ public class TestCompactionArchiveIOException { TableName tableName = TableName.valueOf(name.getMethodName()); TableDescriptor htd = TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(fam)).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(fam)).build(); RegionInfo info = RegionInfoBuilder.newBuilder(tableName).build(); HRegion region = initHRegion(htd, info); RegionServerServices rss = mock(RegionServerServices.class); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionLifeCycleTracker.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionLifeCycleTracker.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionLifeCycleTracker.java index 6a6e907..e680e86 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionLifeCycleTracker.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionLifeCycleTracker.java @@ -148,9 +148,9 @@ public class TestCompactionLifeCycleTracker { public void setUp() throws IOException { UTIL.getAdmin() .createTable(TableDescriptorBuilder.newBuilder(NAME) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(CF1)) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(CF2)) - .addCoprocessor(CompactionObserver.class.getName()).build()); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(CF1)) + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(CF2)) + .setCoprocessor(CompactionObserver.class.getName()).build()); try (Table table = UTIL.getConnection().getTable(NAME)) { for (int i = 0; i < 100; i++) { byte[] row = Bytes.toBytes(i); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java index b7e0164..6da5ec0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java @@ -953,7 +953,7 @@ public class TestDefaultMemStore { // parameterized tests add [#] suffix get rid of [ and ]. TableDescriptor desc = TableDescriptorBuilder .newBuilder(TableName.valueOf(name.getMethodName().replaceAll("[\\[\\]]", "_"))) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of("foo")).build(); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of("foo")).build(); RegionInfo hri = RegionInfoBuilder.newBuilder(desc.getTableName()) .setStartKey(Bytes.toBytes("row_0200")).setEndKey(Bytes.toBytes("row_0300")).build(); HRegion r = HRegion.createHRegion(hri, testDir, conf, desc, wFactory.getWAL(hri)); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushLifeCycleTracker.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushLifeCycleTracker.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushLifeCycleTracker.java index 278afe0..b2fbe2d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushLifeCycleTracker.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushLifeCycleTracker.java @@ -182,8 +182,8 @@ public class TestFlushLifeCycleTracker { public void setUp() throws IOException { UTIL.getAdmin() .createTable(TableDescriptorBuilder.newBuilder(NAME) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(CF)) - .addCoprocessor(FlushObserver.class.getName()).build()); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(CF)) + .setCoprocessor(FlushObserver.class.getName()).build()); region = UTIL.getHBaseCluster().getRegions(NAME).get(0); } http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java index 26b57b0..6e39afd 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionReplayEvents.java @@ -157,7 +157,7 @@ public class TestHRegionReplayEvents { method = name.getMethodName(); TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(TableName.valueOf(method)); for (byte[] family : families) { - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(family)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(family)); } htd = builder.build(); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java index 1b2009c..8dadd9b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java @@ -204,7 +204,7 @@ public class TestHStore { private void initHRegion(String methodName, Configuration conf, TableDescriptorBuilder builder, ColumnFamilyDescriptor hcd, MyStoreHook hook, boolean switchToPread) throws IOException { - TableDescriptor htd = builder.addColumnFamily(hcd).build(); + TableDescriptor htd = builder.setColumnFamily(hcd).build(); Path basedir = new Path(DIR + methodName); Path tableDir = FSUtils.getTableDir(basedir, htd.getTableName()); final Path logdir = new Path(basedir, AbstractFSWALProvider.getWALDirectoryName(methodName)); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreCompaction.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreCompaction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreCompaction.java index 814c86f..cc9e385 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreCompaction.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreCompaction.java @@ -201,7 +201,7 @@ public class TestMobStoreCompaction { TableDescriptor td = TableDescriptorBuilder .newBuilder(region.getTableDescriptor()) .removeColumnFamily(cfName) - .addColumnFamily(cfd) + .setColumnFamily(cfd) .build(); region.setTableDescriptor(td); return region; http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java index e2d9159..fab6512 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java @@ -553,7 +553,7 @@ public class TestRegionServerMetrics { TableDescriptor td = TableDescriptorBuilder .newBuilder(region.getTableDescriptor()) .removeColumnFamily(cfName) - .addColumnFamily(cfd) + .setColumnFamily(cfd) .build(); ((HRegion)region).setTableDescriptor(td); return region; http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.java index a3b5f22..5ad8e21 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.java @@ -130,8 +130,8 @@ public class TestRegionServerReadRequestMetrics { private static Table createTable() throws IOException { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(TABLE_NAME); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(CF1)); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(CF2).setTimeToLive(TTL) + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(CF1)); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(CF2).setTimeToLive(TTL) .build()); admin.createTable(builder.build()); return TEST_UTIL.getConnection().getTable(TABLE_NAME); @@ -422,8 +422,8 @@ public class TestRegionServerReadRequestMetrics { public void testReadRequestsWithCoprocessor() throws Exception { TableName tableName = TableName.valueOf("testReadRequestsWithCoprocessor"); TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName); - builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(CF1)); - builder.addCoprocessor(ScanRegionCoprocessor.class.getName()); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(CF1)); + builder.setCoprocessor(ScanRegionCoprocessor.class.getName()); admin.createTable(builder.build()); try { http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.java index 5596fc9..3e5ab9b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.java @@ -88,7 +88,7 @@ public class TestSplitWalDataLoss { Admin admin = testUtil.getAdmin(); admin.createNamespace(namespace); admin.createTable(TableDescriptorBuilder.newBuilder(tableName) - .addColumnFamily(ColumnFamilyDescriptorBuilder.of(family)).build()); + .setColumnFamily(ColumnFamilyDescriptorBuilder.of(family)).build()); testUtil.waitTableAvailable(tableName); } http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java index 5b0a60f..7ce2418 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java @@ -85,7 +85,7 @@ public class TestStoreFileRefresherChore { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName).setRegionReplication(regionReplication); Arrays.stream(families).map(family -> ColumnFamilyDescriptorBuilder.newBuilder(family) - .setMaxVersions(Integer.MAX_VALUE).build()).forEachOrdered(builder::addColumnFamily); + .setMaxVersions(Integer.MAX_VALUE).build()).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/regionserver/TestSwitchToStreamRead.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSwitchToStreamRead.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSwitchToStreamRead.java index 6c8e459..0af2970 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSwitchToStreamRead.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSwitchToStreamRead.java @@ -73,7 +73,7 @@ public class TestSwitchToStreamRead { VALUE_PREFIX = sb.append("-").toString(); REGION = UTIL.createLocalHRegion( TableDescriptorBuilder.newBuilder(TABLE_NAME) - .addColumnFamily( + .setColumnFamily( ColumnFamilyDescriptorBuilder.newBuilder(FAMILY).setBlocksize(1024).build()) .build(), null, null); http://git-wip-us.apache.org/repos/asf/hbase/blob/4f2133ee/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.java index c7a2a7c..599260b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.java @@ -104,7 +104,7 @@ public class TestWALMonotonicallyIncreasingSeqId { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName); Arrays.stream(families).map( f -> ColumnFamilyDescriptorBuilder.newBuilder(f).setMaxVersions(Integer.MAX_VALUE).build()) - .forEachOrdered(builder::addColumnFamily); + .forEachOrdered(builder::setColumnFamily); return builder.build(); }
