fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-12 08:41:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'unstable' into incrbyfloat

Browse Source
This commit is contained in:
antirez
2011-11-14 15:59:56 +01:00
parent 70023978fd 762eea07ca
commit d4a3cfed9c
6 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/redis.c
View File

@ -563,17 +563,17 @@ void activeExpireCycle(void) {
* of the keys were expired. */
do {
long num = dictSize(db->expires);
time_t now = time(NULL);
long long now = mstime();
expired = 0;
if (num > REDIS_EXPIRELOOKUPS_PER_CRON)
num = REDIS_EXPIRELOOKUPS_PER_CRON;
while (num--) {
dictEntry *de;
time_t t;
long long t;
if ((de = dictGetRandomKey(db->expires)) == NULL) break;
t = (time_t) dictGetVal(de);
t = dictGetSignedIntegerVal(de);
if (now > t) {
sds key = dictGetKey(de);
robj *keyobj = createStringObject(key,sdslen(key));