fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-17 16:10:50 +00:00
Code Issues Projects Releases Wiki Activity

Fixed issues with expire introduced with latest millisecond resolution feature. Many time_t were not converted to long long, and one time() call was not replaced with mstime().

Browse Source
This commit is contained in:
antirez 2011-11-12 01:04:27 +01:00
parent 3570629f90
commit 4be855e757
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/aof.c
View File

@ -431,7 +431,7 @@ int rewriteAppendOnlyFile(char *filename) {
FILE *fp;
char tmpfile[256];
int j;
time_t now = time(NULL);
long long now = mstime();
/* Note that we have to use a different temp name here compared to the
* one used by rewriteAppendOnlyFileBackground() function. */
@ -462,7 +462,7 @@ int rewriteAppendOnlyFile(char *filename) {
while((de = dictNext(di)) != NULL) {
sds keystr;
robj key, *o;
time_t expiretime;
long long expiretime;
keystr = dictGetKey(de);
o = dictGetVal(de);

2
src/debug.c
View File

@ -91,7 +91,7 @@ void computeDatasetDigest(unsigned char *final) {
while((de = dictNext(di)) != NULL) {
sds key;
robj *keyobj, *o;
time_t expiretime;
long long expiretime;
memset(digest,0,20); /* This key-val digest */
key = dictGetKey(de);

2
src/rdb.c
View File

@ -597,7 +597,7 @@ int rdbSave(char *filename) {
dictEntry *de;
char tmpfile[256];
int j;
time_t now = mstime();
long long now = mstime();
FILE *fp;
rio rdb;

6
src/redis.c
View File

@ -562,17 +562,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));