hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmhs...@apache.org
Subject [24/50] [abbrv] hbase git commit: HBASE-14468 addendum.
Date Thu, 14 Jan 2016 17:08:38 GMT
HBASE-14468 addendum.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e8fbc9b4
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e8fbc9b4
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e8fbc9b4

Branch: refs/heads/trunk
Commit: e8fbc9b43a3742358e0bdfe441ff4ca9d14e127b
Parents: 72d32cc
Author: Lars Hofhansl <larsh@apache.org>
Authored: Tue Jan 5 15:54:34 2016 -0800
Committer: Lars Hofhansl <larsh@apache.org>
Committed: Tue Jan 5 15:54:34 2016 -0800

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/master/HMaster.java    | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/e8fbc9b4/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 4472b65..2e42acb 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -1607,21 +1607,8 @@ public class HMaster extends HRegionServer implements MasterServices
{
             ExploringCompactionPolicy.class.getName());
     }
 
-    long majorCompactionPeriod = Long.MAX_VALUE;
-    String sv = htd.getConfigurationValue(HConstants.MAJOR_COMPACTION_PERIOD);
-    if (sv != null) {
-      majorCompactionPeriod = Long.parseLong(sv);
-    } else {
-      majorCompactionPeriod =
-          conf.getLong(HConstants.MAJOR_COMPACTION_PERIOD, majorCompactionPeriod);
-    }
-    String splitPolicyClassName = htd.getRegionSplitPolicyClassName();
-    if (splitPolicyClassName == null) {
-      splitPolicyClassName = conf.get(HConstants.HBASE_REGION_SPLIT_POLICY_KEY);
-    }
-
     int blockingFileCount = HStore.DEFAULT_BLOCKING_STOREFILE_COUNT;
-    sv = htd.getConfigurationValue(HStore.BLOCKING_STOREFILES_KEY);
+    String sv = htd.getConfigurationValue(HStore.BLOCKING_STOREFILES_KEY);
     if (sv != null) {
       blockingFileCount = Integer.parseInt(sv);
     } else {
@@ -1634,7 +1621,7 @@ public class HMaster extends HRegionServer implements MasterServices
{
       if (compactionPolicy == null) {
         compactionPolicy = className;
       }
-      if (className.equals(FIFOCompactionPolicy.class.getName()) == false) {
+      if (!compactionPolicy.equals(FIFOCompactionPolicy.class.getName())) {
         continue;
       }
       // FIFOCompaction


Mime
View raw message