Repository: hbase Updated Branches: refs/heads/master f64512bee -> c2eebfdb6
HBASE-18166 [AMv2] We are splitting already-split files v2 Address Stephen Jiang reivew comments; ADDENDUM TO FIX COMPILE Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c2eebfdb Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c2eebfdb Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c2eebfdb Branch: refs/heads/master Commit: c2eebfdb613427fa3314b7ee13c3b9f34ce4c120 Parents: f64512b Author: Michael Stack <[email protected]> Authored: Thu Jun 15 11:40:13 2017 -0700 Committer: Michael Stack <[email protected]> Committed: Thu Jun 15 11:40:13 2017 -0700 ---------------------------------------------------------------------- .../hbase/master/assignment/SplitTableRegionProcedure.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c2eebfdb/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java index ff7e60f..219b67b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java @@ -536,13 +536,13 @@ public class SplitTableRegionProcedure final TableDescriptor htd = env.getMasterServices().getTableDescriptors().get(getTableName()); for (Map.Entry<String, Collection<StoreFileInfo>>e: files.entrySet()) { byte [] familyName = Bytes.toBytes(e.getKey()); - final HColumnDescriptor hcd = htd.getFamily(familyName); + final ColumnFamilyDescriptor hcd = htd.getColumnFamily(familyName); final Collection<StoreFileInfo> storeFiles = e.getValue(); if (storeFiles != null && storeFiles.size() > 0) { final CacheConfig cacheConf = new CacheConfig(conf, hcd); for (StoreFileInfo storeFileInfo: storeFiles) { 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)); futures.add(threadPool.submit(sfs)); }
