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
fb8409a5
Commit
fb8409a5
authored
Apr 03, 2012
by
antirez
Browse files
Another fix for MIGRATE.
parent
bde80cb2
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/migrate.c
View file @
fb8409a5
...
@@ -130,7 +130,7 @@ void migrateCommand(redisClient *c) {
...
@@ -130,7 +130,7 @@ void migrateCommand(redisClient *c) {
int
fd
;
int
fd
;
long
timeout
;
long
timeout
;
long
dbid
;
long
dbid
;
long
long
ttl
;
long
long
ttl
,
expireat
;
robj
*
o
;
robj
*
o
;
rio
cmd
,
payload
;
rio
cmd
,
payload
;
...
@@ -168,13 +168,16 @@ void migrateCommand(redisClient *c) {
...
@@ -168,13 +168,16 @@ 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
])
-
mstime
();
expireat
=
getExpire
(
c
->
db
,
c
->
argv
[
3
]);
if
(
ttl
<
1
)
ttl
=
1
;
if
(
expireat
!=
-
1
)
{
ttl
=
expireat
-
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
);
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
,(
ttl
==
-
1
)
?
0
:
ttl
));
redisAssertWithInfo
(
c
,
NULL
,
rioWriteBulkLongLong
(
&
cmd
,(
expireat
==-
1
)
?
0
:
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. */
...
...
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