Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
84e5684b
Commit
84e5684b
authored
Apr 03, 2012
by
antirez
Browse files
Two fixed for MIGRATE: fix TTL propagation and fix transferring of data bigger than 64k.
parent
e7957ca6
Changes
1
Show whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
84e5684b
...
...
@@ -1586,7 +1586,7 @@ void migrateCommand(redisClient *c) {
int fd;
long timeout;
long dbid;
time_t
ttl
;
long long
ttl;
robj *o;
rio cmd, payload;
...
...
@@ -1624,7 +1624,8 @@ void migrateCommand(redisClient *c) {
redisAssertWithInfo(c,NULL,rioWriteBulkString(&cmd,"SELECT",6));
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,rioWriteBulkString(&cmd,"RESTORE",7));
redisAssertWithInfo(c,NULL,c->argv[3]->encoding == REDIS_ENCODING_RAW);
...
...
@@ -1646,7 +1647,7 @@ void migrateCommand(redisClient *c) {
while ((towrite = sdslen(buf)-pos) > 0) {
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;
pos += nwritten;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment