hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-18166 [AMv2] We are splitting already-split files v2 Address Stephen Jiang reivew comments; ADDENDUM TO FIX COMPILE
Date Thu, 15 Jun 2017 18:40:45 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-2 c02a14214 -> 8c7bf7b0a


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/8c7bf7b0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8c7bf7b0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8c7bf7b0

Branch: refs/heads/branch-2
Commit: 8c7bf7b0a92beac1dcb1f6a59d1057f7838bdc91
Parents: c02a142
Author: Michael Stack <stack@apache.org>
Authored: Thu Jun 15 11:40:13 2017 -0700
Committer: Michael Stack <stack@apache.org>
Committed: Thu Jun 15 11:40:38 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/8c7bf7b0/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));
         }


Mime
View raw message