You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2017/05/03 21:10:46 UTC
[1/2] hbase git commit: Addendum patch for HBASE-12870. Added check
for null pointer.
Repository: hbase
Updated Branches:
refs/heads/branch-1 9f25836d9 -> e08277ac8
refs/heads/master ff998ef74 -> 78f6799f4
Addendum patch for HBASE-12870. Added check for null pointer.
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/78f6799f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/78f6799f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/78f6799f
Branch: refs/heads/master
Commit: 78f6799f4d53bea368caec77ff32db35109bd96b
Parents: ff998ef
Author: Chinmay Kulkarni <ck...@salesforce.com>
Authored: Wed May 3 13:34:56 2017 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed May 3 14:03:16 2017 -0700
----------------------------------------------------------------------
.../regionserver/compactions/RatioBasedCompactionPolicy.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/78f6799f/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 ddc07cd..2ee051b 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
@@ -72,7 +72,10 @@ public class RatioBasedCompactionPolicy extends SortedCompactionPolicy {
regionInfo = this.toString();
}
// Major compaction time has elapsed.
- long cfTTL = this.storeConfigInfo.getStoreFileTtl();
+ long cfTTL = HConstants.FOREVER;
+ if (this.storeConfigInfo != null) {
+ cfTTL = this.storeConfigInfo.getStoreFileTtl();
+ }
if (filesToCompact.size() == 1) {
// Single file
StoreFile sf = filesToCompact.iterator().next();
[2/2] hbase git commit: Addendum patch for HBASE-12870. Added check
for null pointer.
Posted by ap...@apache.org.
Addendum patch for HBASE-12870. Added check for null pointer.
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e08277ac
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e08277ac
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e08277ac
Branch: refs/heads/branch-1
Commit: e08277ac8fe466bf63f6fc342256ab7b8d41243a
Parents: 9f25836
Author: Chinmay Kulkarni <ck...@salesforce.com>
Authored: Wed May 3 13:34:56 2017 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed May 3 14:03:27 2017 -0700
----------------------------------------------------------------------
.../regionserver/compactions/RatioBasedCompactionPolicy.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e08277ac/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 9f476d3..2d8772c 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
@@ -72,7 +72,10 @@ public class RatioBasedCompactionPolicy extends SortedCompactionPolicy {
regionInfo = this.toString();
}
// Major compaction time has elapsed.
- long cfTTL = this.storeConfigInfo.getStoreFileTtl();
+ long cfTTL = HConstants.FOREVER;
+ if (this.storeConfigInfo != null) {
+ cfTTL = this.storeConfigInfo.getStoreFileTtl();
+ }
if (filesToCompact.size() == 1) {
// Single file
StoreFile sf = filesToCompact.iterator().next();