mirror of
https://github.com/fluencelabs/redis
synced 2025-03-25 03:41:04 +00:00
Delete unused role checking.
When check rdb file, it is unnecessary to check role.
This commit is contained in:
parent
4cb5bd4e9d
commit
c2a85fb3c5
@ -286,12 +286,8 @@ int redis_check_rdb(char *rdbfilename, FILE *fp) {
|
|||||||
/* Read value */
|
/* Read value */
|
||||||
rdbstate.doing = RDB_CHECK_DOING_READ_OBJECT_VALUE;
|
rdbstate.doing = RDB_CHECK_DOING_READ_OBJECT_VALUE;
|
||||||
if ((val = rdbLoadObject(type,&rdb)) == NULL) goto eoferr;
|
if ((val = rdbLoadObject(type,&rdb)) == NULL) goto eoferr;
|
||||||
/* Check if the key already expired. This function is used when loading
|
/* Check if the key already expired. */
|
||||||
* an RDB file from disk, either at startup, or when an RDB was
|
if (expiretime != -1 && expiretime < now)
|
||||||
* 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)
|
|
||||||
rdbstate.already_expired++;
|
rdbstate.already_expired++;
|
||||||
if (expiretime != -1) rdbstate.expires++;
|
if (expiretime != -1) rdbstate.expires++;
|
||||||
rdbstate.key = NULL;
|
rdbstate.key = NULL;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user