From 12e91892a0ec06c55534753b5e52bf5036450107 Mon Sep 17 00:00:00 2001 From: antirez Date: Tue, 3 Apr 2012 15:10:42 +0200 Subject: [PATCH] Another fix for MIGRATE. --- src/cluster.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/cluster.c b/src/cluster.c index 6f771428a..8cd20c84d 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -1586,7 +1586,7 @@ void migrateCommand(redisClient *c) { int fd; long timeout; long dbid; - long long ttl; + long long ttl, expireat; robj *o; rio cmd, payload; @@ -1624,13 +1624,16 @@ void migrateCommand(redisClient *c) { redisAssertWithInfo(c,NULL,rioWriteBulkString(&cmd,"SELECT",6)); redisAssertWithInfo(c,NULL,rioWriteBulkLongLong(&cmd,dbid)); - ttl = getExpire(c->db,c->argv[3])-mstime(); - if (ttl < 1) ttl = 1; + expireat = getExpire(c->db,c->argv[3]); + if (expireat != -1) { + ttl = expireat-mstime(); + if (ttl < 1) ttl = 1; + } redisAssertWithInfo(c,NULL,rioWriteBulkCount(&cmd,'*',4)); redisAssertWithInfo(c,NULL,rioWriteBulkString(&cmd,"RESTORE",7)); redisAssertWithInfo(c,NULL,c->argv[3]->encoding == REDIS_ENCODING_RAW); redisAssertWithInfo(c,NULL,rioWriteBulkString(&cmd,c->argv[3]->ptr,sdslen(c->argv[3]->ptr))); - redisAssertWithInfo(c,NULL,rioWriteBulkLongLong(&cmd,(ttl == -1) ? 0 : ttl)); + redisAssertWithInfo(c,NULL,rioWriteBulkLongLong(&cmd,(expireat==-1) ? 0 : ttl)); /* Finally the last argument that is the serailized object payload * in the DUMP format. */