gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keys command should look at the snapshots expire datastructure

Browse Source 
Former-commit-id: 70563afab48e607e127c07d637660d94d1eede6d
This commit is contained in:
John Sully 2020-06-09 18:57:36 -04:00
parent cc16e74f8b
commit 292d5b6545
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/db.cpp
View File

@ -39,7 +39,7 @@
* C-level DB API * 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); int expireIfNeeded(redisDb *db, robj *key, robj *o);
void slotToKeyUpdateKeyCore(const char *key, size_t keylen, int add); 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)) { if (allkeys || stringmatchlen(pattern,plen,key,sdslen(key),0)) {
keyobj = createStringObject(key,sdslen(key)); keyobj = createStringObject(key,sdslen(key));
if (!keyIsExpired(c->db,keyobj)) { if (!keyIsExpired(db,keyobj)) {
addReplyBulk(c,keyobj); addReplyBulk(c,keyobj);
numkeys++; 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 */ /* Check if the key is expired. Note, this does not check subexpires */
int keyIsExpired(redisDb *db, robj *key) { int keyIsExpired(const redisDbPersistentDataSnapshot *db, robj *key) {
expireEntry *pexpire = db->getExpire(key); const expireEntry *pexpire = db->getExpire(key);
mstime_t now; mstime_t now;
if (pexpire == nullptr) return 0; /* No expire for this key */ if (pexpire == nullptr) return 0; /* No expire for this key */