From 22cfe32aba7e0c5402b22ff2553483bfcdf75f26 Mon Sep 17 00:00:00 2001 From: zhangduo Date: Mon, 18 Apr 2016 11:51:10 +0800 Subject: [PATCH] HBASE-15664 Use Long.MAX_VALUE instead of HConstants.FOREVER in CompactionPolicy --- .../hbase/regionserver/compactions/DateTieredCompactionPolicy.java | 5 ++--- .../hbase/regionserver/compactions/RatioBasedCompactionPolicy.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DateTieredCompactionPolicy.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DateTieredCompactionPolicy.java index d32afe1..aefcd8f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DateTieredCompactionPolicy.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DateTieredCompactionPolicy.java @@ -35,7 +35,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseInterfaceAudience; -import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HDFSBlocksDistribution; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.regionserver.HRegionServer; @@ -117,7 +116,7 @@ public class DateTieredCompactionPolicy extends SortedCompactionPolicy { for (StoreFile file: filesToCompact) { Long minTimestamp = file.getMinimumTimestamp(); long oldest = (minTimestamp == null) ? Long.MIN_VALUE : now - minTimestamp.longValue(); - if (cfTtl != HConstants.FOREVER && oldest >= cfTtl) { + if (cfTtl != Long.MAX_VALUE && oldest >= cfTtl) { LOG.debug("Major compaction triggered on store " + this + "; for TTL maintenance"); return true; @@ -426,4 +425,4 @@ public class DateTieredCompactionPolicy extends SortedCompactionPolicy { return "[" + startMillis() + ", " + endMillis() + ")"; } } -} \ No newline at end of file +} diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.java index 1685aa2..86e9088 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.java @@ -68,7 +68,7 @@ public class RatioBasedCompactionPolicy extends SortedCompactionPolicy { StoreFile sf = filesToCompact.iterator().next(); Long minTimestamp = sf.getMinimumTimestamp(); long oldest = (minTimestamp == null) ? Long.MIN_VALUE : now - minTimestamp.longValue(); - if (sf.isMajorCompaction() && (cfTtl == HConstants.FOREVER || oldest < cfTtl)) { + if (sf.isMajorCompaction() && (cfTtl == Long.MAX_VALUE || oldest < cfTtl)) { float blockLocalityIndex = sf.getHDFSBlockDistribution().getBlockLocalityIndex( HRegionServer.getHostname(comConf.conf)); -- 1.9.1