diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.java index dc3259f03d3a..dc6ba2a63ba0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.java @@ -140,8 +140,7 @@ protected ScanQueryMatcher(ExtendedCell startKey, ScanInfo scanInfo, ColumnTrack } /** Returns true if the cell is expired */ - private static boolean isCellTTLExpired(final ExtendedCell cell, final long oldestTimestamp, - final long now) { + private static boolean isCellTTLExpired(final ExtendedCell cell, final long now) { // Look for a TTL tag first. Use it instead of the family setting if // found. If a cell has multiple TTLs, resolve the conflict by using the // first tag encountered. @@ -192,7 +191,7 @@ protected final MatchCode preCheck(ExtendedCell cell) { return columns.getNextRowOrNextColumn(cell); } // check if the cell is expired by cell TTL - if (isCellTTLExpired(cell, this.oldestUnexpiredTS, this.now)) { + if (isCellTTLExpired(cell, this.now)) { return MatchCode.SKIP; } return null;