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
53d46fa7
Commit
53d46fa7
authored
Jul 24, 2018
by
antirez
Browse files
Make changes of PR #5154 hopefully simpler.
parent
e52a036a
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
53d46fa7
...
...
@@ -5146,7 +5146,10 @@ try_again:
serverAssertWithInfo
(
c
,
NULL
,
rioWriteBulkLongLong
(
&
cmd
,
dbid
));
}
int
num_keys_non_expired
=
0
;
int
expired
=
0
;
/* Number of keys that we'll find already expired.
Note that serializing large keys may take some time
so certain keys that were found non expired by the
lookupKey() function, may be expired later. */
/* Create RESTORE payload and generate the protocol to call the command. */
for
(
j
=
0
;
j
<
num_keys
;
j
++
)
{
...
...
@@ -5155,10 +5158,12 @@ try_again:
if
(
expireat
!=
-
1
)
{
ttl
=
expireat
-
mstime
();
if
(
ttl
<
0
)
continue
;
if
(
ttl
<
0
)
{
expired
++
;
continue
;
}
if
(
ttl
<
1
)
ttl
=
1
;
}
num_keys_non_expired
++
;
serverAssertWithInfo
(
c
,
NULL
,
rioWriteBulkCount
(
&
cmd
,
'*'
,
replace
?
5
:
4
));
...
...
@@ -5221,9 +5226,9 @@ try_again:
int
socket_error
=
0
;
int
del_idx
=
1
;
/* Index of the key argument for the replicated DEL op. */
if
(
!
copy
)
newargv
=
zmalloc
(
sizeof
(
robj
*
)
*
(
num_keys
_non_expired
+
1
));
if
(
!
copy
)
newargv
=
zmalloc
(
sizeof
(
robj
*
)
*
(
num_keys
+
1
));
for
(
j
=
0
;
j
<
num_keys
_non_
expired
;
j
++
)
{
for
(
j
=
0
;
j
<
num_keys
-
expired
;
j
++
)
{
if
(
syncReadLine
(
cs
->
fd
,
buf2
,
sizeof
(
buf2
),
timeout
)
<=
0
)
{
socket_error
=
1
;
break
;
...
...
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