HBASE-18166 [AMv2] We are splitting already-split files v2 Address Stephen Jiang reivew comments; ADDENDUM TO FIX COMPILE

This commit is contained in:
Michael Stack 2017-06-15 11:40:13 -07:00
parent c02a142143
commit 8c7bf7b0a9
1 changed files with 2 additions and 2 deletions

View File

@ -536,13 +536,13 @@ public class SplitTableRegionProcedure
final TableDescriptor htd = env.getMasterServices().getTableDescriptors().get(getTableName()); final TableDescriptor htd = env.getMasterServices().getTableDescriptors().get(getTableName());
for (Map.Entry<String, Collection<StoreFileInfo>>e: files.entrySet()) { for (Map.Entry<String, Collection<StoreFileInfo>>e: files.entrySet()) {
byte [] familyName = Bytes.toBytes(e.getKey()); byte [] familyName = Bytes.toBytes(e.getKey());
final HColumnDescriptor hcd = htd.getFamily(familyName); final ColumnFamilyDescriptor hcd = htd.getColumnFamily(familyName);
final Collection<StoreFileInfo> storeFiles = e.getValue(); final Collection<StoreFileInfo> storeFiles = e.getValue();
if (storeFiles != null && storeFiles.size() > 0) { if (storeFiles != null && storeFiles.size() > 0) {
final CacheConfig cacheConf = new CacheConfig(conf, hcd); final CacheConfig cacheConf = new CacheConfig(conf, hcd);
for (StoreFileInfo storeFileInfo: storeFiles) { for (StoreFileInfo storeFileInfo: storeFiles) {
StoreFileSplitter sfs = StoreFileSplitter sfs =
new StoreFileSplitter(regionFs, family.getBytes(), new HStoreFile(mfs.getFileSystem(), new StoreFileSplitter(regionFs, familyName, new HStoreFile(mfs.getFileSystem(),
storeFileInfo, conf, cacheConf, hcd.getBloomFilterType(), true)); storeFileInfo, conf, cacheConf, hcd.getBloomFilterType(), true));
futures.add(threadPool.submit(sfs)); futures.add(threadPool.submit(sfs));
} }