Unverified Commit c2a85fb3 authored by Shen Longxing's avatar Shen Longxing Committed by GitHub
Browse files

Delete unused role checking.

When check rdb file, it is unnecessary to check role.
parent 4cb5bd4e
...@@ -286,12 +286,8 @@ int redis_check_rdb(char *rdbfilename, FILE *fp) { ...@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment