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

EXPIRE should not resurrect keys. Issue #1026.

Browse Source
This commit is contained in:
antirez 2013-03-28 12:45:07 +01:00
parent 601cea665d
commit 140260409e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/db.c
View File

@ -562,7 +562,6 @@ int expireIfNeeded(redisDb *db, robj *key) {
* unit is either UNIT_SECONDS or UNIT_MILLISECONDS, and is only used for * unit is either UNIT_SECONDS or UNIT_MILLISECONDS, and is only used for
* the argv[2] parameter. The basetime is always specified in milliseconds. */ * the argv[2] parameter. The basetime is always specified in milliseconds. */
void expireGenericCommand(redisClient *c, long long basetime, int unit) { void expireGenericCommand(redisClient *c, long long basetime, int unit) {
dictEntry *de;
robj *key = c->argv[1], *param = c->argv[2]; robj *key = c->argv[1], *param = c->argv[2];
long long when; /* unix time in milliseconds when the key will expire. */ long long when; /* unix time in milliseconds when the key will expire. */
@ -572,11 +571,12 @@ void expireGenericCommand(redisClient *c, long long basetime, int unit) {
if (unit == UNIT_SECONDS) when *= 1000; if (unit == UNIT_SECONDS) when *= 1000;
when += basetime; when += basetime;
de = dictFind(c->db->dict,key->ptr); /* No key, return zero. */
if (de == NULL) { if (lookupKeyRead(c->db,key) == NULL) {
addReply(c,shared.czero); addReply(c,shared.czero);
return; return;
} }
/* EXPIRE with negative TTL, or EXPIREAT with a timestamp into the past /* EXPIRE with negative TTL, or EXPIREAT with a timestamp into the past
* should never be executed as a DEL when load the AOF or in the context * should never be executed as a DEL when load the AOF or in the context
* of a slave instance. * of a slave instance.