opensourcemirror
/
redis
mirror of https://github.com/antirez/redis.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge fdcfa57f4d into 804110a487

This commit is contained in:
judeng 2024-04-18 10:34:14 +01:00 committed by GitHub
parent 804110a487 fdcfa57f4d
commit 220dfa432b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/expire.c
View File

@ -607,6 +607,27 @@ void expireGenericCommand(client *c, long long basetime, int unit) {
}
when += basetime;
if (checkAlreadyExpired(when)) {
robj *aux;
int deleted = dbGenericDelete(c->db, key, server.lazyfree_lazy_expire, DB_FLAG_KEY_EXPIRED);
/* key not exist */
if (!deleted) {
addReply(c, shared.czero);
return;
}
server.dirty++;
/* Replicate/AOF this as an explicit DEL or UNLINK. */
aux = server.lazyfree_lazy_expire ? shared.unlink : shared.del;
rewriteClientCommandVector(c, 2, aux, key);
signalModifiedKey(c, c->db, key);
notifyKeyspaceEvent(NOTIFY_GENERIC, "del", key, c->db->id);
addReply(c, shared.cone);
return;
}
/* No key, return zero. */
if (lookupKeyWrite(c->db,key) == NULL) {
addReply(c,shared.czero);
@ -657,21 +678,6 @@ void expireGenericCommand(client *c, long long basetime, int unit) {
}
}
if (checkAlreadyExpired(when)) {
robj *aux;
int deleted = dbGenericDelete(c->db,key,server.lazyfree_lazy_expire,DB_FLAG_KEY_EXPIRED);
serverAssertWithInfo(c,key,deleted);
server.dirty++;
/* Replicate/AOF this as an explicit DEL or UNLINK. */
aux = server.lazyfree_lazy_expire ? shared.unlink : shared.del;
rewriteClientCommandVector(c,2,aux,key);
signalModifiedKey(c,c->db,key);
notifyKeyspaceEvent(NOTIFY_GENERIC,"del",key,c->db->id);
addReply(c, shared.cone);
return;
} else {
setExpire(c,c->db,key,when);
addReply(c,shared.cone);
/* Propagate as PEXPIREAT millisecond-timestamp
@ -691,7 +697,6 @@ void expireGenericCommand(client *c, long long basetime, int unit) {
notifyKeyspaceEvent(NOTIFY_GENERIC,"expire",key,c->db->id);
server.dirty++;
return;
}
}
/* EXPIRE key seconds [ NX | XX | GT | LT] */