fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-08 02:18:04 +00:00
Code Issues Projects Releases Wiki Activity

Two fixed for MIGRATE: fix TTL propagation and fix transferring of data bigger than 64k.

Browse Source
This commit is contained in:
antirez 2012-04-03 12:17:40 +02:00
parent e7957ca628
commit 84e5684bca
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cluster.c
View File

@ -1586,7 +1586,7 @@ void migrateCommand(redisClient *c) {
int fd; int fd;
long timeout; long timeout;
long dbid; long dbid;
time_t ttl; long long ttl;
robj *o; robj *o;
rio cmd, payload; rio cmd, payload;
@ -1624,7 +1624,8 @@ void migrateCommand(redisClient *c) {
redisAssertWithInfo(c,NULL,rioWriteBulkString(&cmd,"SELECT",6)); redisAssertWithInfo(c,NULL,rioWriteBulkString(&cmd,"SELECT",6));
redisAssertWithInfo(c,NULL,rioWriteBulkLongLong(&cmd,dbid)); redisAssertWithInfo(c,NULL,rioWriteBulkLongLong(&cmd,dbid));
ttl = getExpire(c->db,c->argv[3]); ttl = getExpire(c->db,c->argv[3])-mstime();
if (ttl < 1) ttl = 1;
redisAssertWithInfo(c,NULL,rioWriteBulkCount(&cmd,'*',4)); redisAssertWithInfo(c,NULL,rioWriteBulkCount(&cmd,'*',4));
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);
@ -1646,7 +1647,7 @@ void migrateCommand(redisClient *c) {
while ((towrite = sdslen(buf)-pos) > 0) { while ((towrite = sdslen(buf)-pos) > 0) {
towrite = (towrite > (64*1024) ? (64*1024) : towrite); towrite = (towrite > (64*1024) ? (64*1024) : towrite);
nwritten = syncWrite(fd,buf+nwritten,towrite,timeout); nwritten = syncWrite(fd,buf+pos,towrite,timeout);
if (nwritten != (signed)towrite) goto socket_wr_err; if (nwritten != (signed)towrite) goto socket_wr_err;
pos += nwritten; pos += nwritten;
} }