From 292d5b65457a2cf9d780ad486978e5b5ea19c148 Mon Sep 17 00:00:00 2001 From: John Sully Date: Tue, 9 Jun 2020 18:57:36 -0400 Subject: [PATCH] keys command should look at the snapshots expire datastructure Former-commit-id: 70563afab48e607e127c07d637660d94d1eede6d --- src/db.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/db.cpp b/src/db.cpp index d1b33be61..156784634 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -39,7 +39,7 @@ * C-level DB API *----------------------------------------------------------------------------*/ -int keyIsExpired(redisDb *db, robj *key); +int keyIsExpired(const redisDbPersistentDataSnapshot *db, robj *key); int expireIfNeeded(redisDb *db, robj *key, robj *o); void slotToKeyUpdateKeyCore(const char *key, size_t keylen, int add); @@ -840,7 +840,7 @@ void keysCommandCore(client *cIn, const redisDbPersistentDataSnapshot *db, sds p if (allkeys || stringmatchlen(pattern,plen,key,sdslen(key),0)) { keyobj = createStringObject(key,sdslen(key)); - if (!keyIsExpired(c->db,keyobj)) { + if (!keyIsExpired(db,keyobj)) { addReplyBulk(c,keyobj); numkeys++; } @@ -1647,8 +1647,8 @@ void propagateSubkeyExpire(redisDb *db, int type, robj *key, robj *subkey) } /* Check if the key is expired. Note, this does not check subexpires */ -int keyIsExpired(redisDb *db, robj *key) { - expireEntry *pexpire = db->getExpire(key); +int keyIsExpired(const redisDbPersistentDataSnapshot *db, robj *key) { + const expireEntry *pexpire = db->getExpire(key); mstime_t now; if (pexpire == nullptr) return 0; /* No expire for this key */