This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.5 by this push:
new e46411b32d5 HBASE-29874 Removing the useless parameters from
ScanQueryMatcher.isCellTTLExpired (#7720)
e46411b32d5 is described below
commit e46411b32d57851479641756df8b710ad6410e26
Author: Liu Xiao <[email protected]>
AuthorDate: Wed Feb 25 22:17:18 2026 +0800
HBASE-29874 Removing the useless parameters from
ScanQueryMatcher.isCellTTLExpired (#7720)
Signed-off-by: Duo Zhang <[email protected]>
Signed-off-by: Junegunn Choi <[email protected]>
(cherry picked from commit e2cfd2c8cfa7689360b161c6f4a7fa3829ed5685)
---
.../hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
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 a44baf2832e..a12fa83283d 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
@@ -138,8 +138,7 @@ public abstract class ScanQueryMatcher implements
ShipperListener {
}
/** Returns true if the cell is expired */
- private static boolean isCellTTLExpired(final Cell cell, final long
oldestTimestamp,
- final long now) {
+ private static boolean isCellTTLExpired(final Cell 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.
@@ -174,7 +173,7 @@ public abstract class ScanQueryMatcher implements
ShipperListener {
}
// check if the cell is expired by cell TTL
- if (isCellTTLExpired(cell, this.oldestUnexpiredTS, this.now)) {
+ if (isCellTTLExpired(cell, this.now)) {
return MatchCode.SKIP;
}
