From 987e0f6a25c5a3889a692572ac0bb4b5e938cde9 Mon Sep 17 00:00:00 2001 From: zhangduo Date: Sun, 17 Apr 2016 19:21:43 +0800 Subject: [PATCH] HBASE-15664 Use Long.MAX_VALUE instead of HConstants.FOREVER in CompactionPolicy --- .../hbase/regionserver/compactions/DateTieredCompactionPolicy.java | 2 +- .../hbase/regionserver/compactions/RatioBasedCompactionPolicy.java | 2 +- 2 files changed, 2 insertions(+), 2 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 d61af42..49715a9 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 @@ -119,7 +119,7 @@ public class DateTieredCompactionPolicy extends SortedCompactionPolicy { for (StoreFile file: filesToCompact) { Long minTimestamp = file.getMinimumTimestamp(); long oldest = (minTimestamp == null) ? (Long)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; 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 5600a4e..3386bfd 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 @@ -70,7 +70,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( RSRpcServices.getHostname(comConf.conf, false)); -- 1.9.1