You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2016/04/18 14:11:03 UTC
hbase git commit: HBASE-15664 Use Long.MAX_VALUE instead of
HConstants.FOREVER in CompactionPolicy
Repository: hbase
Updated Branches:
refs/heads/master a56b374c5 -> f2e0aca2b
HBASE-15664 Use Long.MAX_VALUE instead of HConstants.FOREVER in CompactionPolicy
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f2e0aca2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f2e0aca2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f2e0aca2
Branch: refs/heads/master
Commit: f2e0aca2b6925cdd1f2896052f4b4e847ee4e1fd
Parents: a56b374
Author: zhangduo <zh...@apache.org>
Authored: Mon Apr 18 11:46:34 2016 +0800
Committer: zhangduo <zh...@apache.org>
Committed: Mon Apr 18 20:10:31 2016 +0800
----------------------------------------------------------------------
.../regionserver/compactions/DateTieredCompactionPolicy.java | 5 ++---
.../regionserver/compactions/RatioBasedCompactionPolicy.java | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f2e0aca2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DateTieredCompactionPolicy.java
----------------------------------------------------------------------
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..6527c9b 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
@@ -36,7 +36,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.RSRpcServices;
@@ -118,8 +117,8 @@ 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) {
+ long oldest = (minTimestamp == null) ? Long.MIN_VALUE : now - minTimestamp.longValue();
+ if (cfTTL != Long.MAX_VALUE && oldest >= cfTTL) {
LOG.debug("Major compaction triggered on store " + this
+ "; for TTL maintenance");
return true;
http://git-wip-us.apache.org/repos/asf/hbase/blob/f2e0aca2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.java
----------------------------------------------------------------------
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));