Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
0cf5b7b5
Commit
0cf5b7b5
authored
Aug 03, 2010
by
antirez
Browse files
allow to set a new EXPIRE of an existing volatile key
parent
c25a5d3b
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/db.c
View file @
0cf5b7b5
...
...
@@ -401,16 +401,13 @@ int removeExpire(redisDb *db, robj *key) {
}
}
int
setExpire
(
redisDb
*
db
,
robj
*
key
,
time_t
when
)
{
void
setExpire
(
redisDb
*
db
,
robj
*
key
,
time_t
when
)
{
dictEntry
*
de
;
/* Reuse the sds from the main dict in the expire dict */
redisAssert
((
de
=
dictFind
(
db
->
dict
,
key
->
ptr
))
!=
NULL
);
if
(
dictAdd
(
db
->
expires
,
dictGetEntryKey
(
de
),(
void
*
)
when
)
==
DICT_ERR
)
{
return
0
;
}
else
{
return
1
;
}
de
=
dictFind
(
db
->
dict
,
key
->
ptr
);
redisAssert
(
de
!=
NULL
);
dictReplace
(
db
->
expires
,
dictGetEntryKey
(
de
),(
void
*
)
when
);
}
/* Return the expire time of the specified key, or -1 if no expire
...
...
@@ -504,13 +501,10 @@ void expireGenericCommand(redisClient *c, robj *key, robj *param, long offset) {
return
;
}
else
{
time_t
when
=
time
(
NULL
)
+
seconds
;
if
(
setExpire
(
c
->
db
,
key
,
when
))
{
addReply
(
c
,
shared
.
cone
);
touchWatchedKey
(
c
->
db
,
key
);
server
.
dirty
++
;
}
else
{
addReply
(
c
,
shared
.
czero
);
}
setExpire
(
c
->
db
,
key
,
when
);
addReply
(
c
,
shared
.
cone
);
touchWatchedKey
(
c
->
db
,
key
);
server
.
dirty
++
;
return
;
}
}
...
...
src/redis.h
View file @
0cf5b7b5
...
...
@@ -755,7 +755,7 @@ int removeExpire(redisDb *db, robj *key);
void
propagateExpire
(
redisDb
*
db
,
robj
*
key
);
int
expireIfNeeded
(
redisDb
*
db
,
robj
*
key
);
time_t
getExpire
(
redisDb
*
db
,
robj
*
key
);
int
setExpire
(
redisDb
*
db
,
robj
*
key
,
time_t
when
);
void
setExpire
(
redisDb
*
db
,
robj
*
key
,
time_t
when
);
robj
*
lookupKey
(
redisDb
*
db
,
robj
*
key
);
robj
*
lookupKeyRead
(
redisDb
*
db
,
robj
*
key
);
robj
*
lookupKeyWrite
(
redisDb
*
db
,
robj
*
key
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment