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
f3980bb9
Unverified
Commit
f3980bb9
authored
Jul 12, 2018
by
Salvatore Sanfilippo
Committed by
GitHub
Jul 12, 2018
Browse files
Merge pull request #5115 from shenlongxing/patch-1
Delete unused role checking.
parents
4cb5bd4e
c2a85fb3
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/redis-check-rdb.c
View file @
f3980bb9
...
...
@@ -286,12 +286,8 @@ int redis_check_rdb(char *rdbfilename, FILE *fp) {
/* Read value */
rdbstate
.
doing
=
RDB_CHECK_DOING_READ_OBJECT_VALUE
;
if
((
val
=
rdbLoadObject
(
type
,
&
rdb
))
==
NULL
)
goto
eoferr
;
/* Check if the key already expired. This function is used when loading
* an RDB file from disk, either at startup, or when an RDB was
* received from the master. In the latter case, the master is
* responsible for key expiry. If we would expire keys here, the
* snapshot taken by the master may not be reflected on the slave. */
if
(
server
.
masterhost
==
NULL
&&
expiretime
!=
-
1
&&
expiretime
<
now
)
/* Check if the key already expired. */
if
(
expiretime
!=
-
1
&&
expiretime
<
now
)
rdbstate
.
already_expired
++
;
if
(
expiretime
!=
-
1
)
rdbstate
.
expires
++
;
rdbstate
.
key
=
NULL
;
...
...
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