diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java index 4b81b3b..ca060d9 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java @@ -155,6 +155,10 @@ public class LoadTestTool extends AbstractHBaseTool { admin.disableTable(tableName); for (byte[] cf : columnFamilies) { HColumnDescriptor columnDesc = tableDesc.getFamily(cf); + boolean isNewCf = columnDesc == null; + if (isNewCf) { + columnDesc = new HColumnDescriptor(cf); + } if (bloomType != null) { columnDesc.setBloomFilterType(bloomType); } @@ -165,7 +169,12 @@ public class LoadTestTool extends AbstractHBaseTool { columnDesc.setDataBlockEncoding(dataBlockEncodingAlgo); columnDesc.setEncodeOnDisk(!encodeInCacheOnly); } - admin.modifyColumn(tableName, columnDesc); + if (isNewCf) { + admin.addColumn(tableName, columnDesc); + } + else { + admin.modifyColumn(tableName, columnDesc); + } } LOG.info("Enabling table " + Bytes.toString(tableName)); admin.enableTable(tableName);