Commit a3fb7fd4 authored by antirez's avatar antirez
Browse files

Minor MIGRATE implementation simplification about ttl handling.

parent 08827157
...@@ -1586,7 +1586,7 @@ void migrateCommand(redisClient *c) { ...@@ -1586,7 +1586,7 @@ void migrateCommand(redisClient *c) {
int fd; int fd;
long timeout; long timeout;
long dbid; long dbid;
long long ttl, expireat; long long ttl = 0, expireat;
robj *o; robj *o;
rio cmd, payload; rio cmd, payload;
...@@ -1633,7 +1633,7 @@ void migrateCommand(redisClient *c) { ...@@ -1633,7 +1633,7 @@ void migrateCommand(redisClient *c) {
redisAssertWithInfo(c,NULL,rioWriteBulkString(&cmd,"RESTORE",7)); redisAssertWithInfo(c,NULL,rioWriteBulkString(&cmd,"RESTORE",7));
redisAssertWithInfo(c,NULL,c->argv[3]->encoding == REDIS_ENCODING_RAW); 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,rioWriteBulkString(&cmd,c->argv[3]->ptr,sdslen(c->argv[3]->ptr)));
redisAssertWithInfo(c,NULL,rioWriteBulkLongLong(&cmd,(expireat==-1) ? 0 : ttl)); redisAssertWithInfo(c,NULL,rioWriteBulkLongLong(&cmd,ttl));
/* Finally the last argument that is the serailized object payload /* Finally the last argument that is the serailized object payload
* in the DUMP format. */ * in the DUMP format. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment