Repository: hbase Updated Branches: refs/heads/branch-1 e31361dcb -> 59bf00562 refs/heads/branch-1.3 a4cd35338 -> 40c1f3974 refs/heads/master ff9c92e16 -> 0f23e61ec
HBASE-15632 Undo the checking of lastStoreFlushTimeMap.isEmpty() introduced in HBASE-13145 (Huaxiang Sun) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0f23e61e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0f23e61e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0f23e61e Branch: refs/heads/master Commit: 0f23e61ec53ef9180b69c87fa9ff91374705724f Parents: ff9c92e Author: Matteo Bertozzi <matteo.berto...@cloudera.com> Authored: Tue Apr 12 11:35:18 2016 -0700 Committer: Matteo Bertozzi <matteo.berto...@cloudera.com> Committed: Tue Apr 12 11:35:18 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/0f23e61e/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index acaecf1..5524de0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -1681,8 +1681,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi @Override public long getEarliestFlushTimeForAllStores() { - return lastStoreFlushTimeMap.isEmpty() ? Long.MAX_VALUE : Collections.min(lastStoreFlushTimeMap - .values()); + return Collections.min(lastStoreFlushTimeMap.values()); } @Override
