fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

RDB: make RDB check aware of LFU/LRU opcodes.

Browse Source
This commit is contained in:
antirez 2018-03-15 16:39:33 +01:00
parent 8176a2ee76
commit b1aae86fc6
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/redis-check-rdb.c
View File

@ -202,10 +202,10 @@ int redis_check_rdb(char *rdbfilename, FILE *fp) {
goto err; goto err;
} }
expiretime = -1;
startLoading(fp); startLoading(fp);
while(1) { while(1) {
robj *key, *val; robj *key, *val;
expiretime = -1;
/* Read type. */ /* Read type. */
rdbstate.doing = RDB_CHECK_DOING_READ_TYPE; rdbstate.doing = RDB_CHECK_DOING_READ_TYPE;
@ -218,20 +218,23 @@ int redis_check_rdb(char *rdbfilename, FILE *fp) {
* to load. Note that after loading an expire we need to * to load. Note that after loading an expire we need to
* load the actual type, and continue. */ * load the actual type, and continue. */
if ((expiretime = rdbLoadTime(&rdb)) == -1) goto eoferr; if ((expiretime = rdbLoadTime(&rdb)) == -1) goto eoferr;
/* We read the time so we need to read the object type again. */
rdbstate.doing = RDB_CHECK_DOING_READ_TYPE;
if ((type = rdbLoadType(&rdb)) == -1) goto eoferr;
/* the EXPIRETIME opcode specifies time in seconds, so convert
* into milliseconds. */
expiretime *= 1000; expiretime *= 1000;
continue; /* Read next opcode. */
} else if (type == RDB_OPCODE_EXPIRETIME_MS) { } else if (type == RDB_OPCODE_EXPIRETIME_MS) {
/* EXPIRETIME_MS: milliseconds precision expire times introduced /* EXPIRETIME_MS: milliseconds precision expire times introduced
* with RDB v3. Like EXPIRETIME but no with more precision. */ * with RDB v3. Like EXPIRETIME but no with more precision. */
rdbstate.doing = RDB_CHECK_DOING_READ_EXPIRE; rdbstate.doing = RDB_CHECK_DOING_READ_EXPIRE;
if ((expiretime = rdbLoadMillisecondTime(&rdb)) == -1) goto eoferr; if ((expiretime = rdbLoadMillisecondTime(&rdb)) == -1) goto eoferr;
/* We read the time so we need to read the object type again. */ continue; /* Read next opcode. */
rdbstate.doing = RDB_CHECK_DOING_READ_TYPE; } else if (type == RDB_OPCODE_FREQ) {
if ((type = rdbLoadType(&rdb)) == -1) goto eoferr; /* FREQ: LFU frequency. */
uint8_t byte;
if (rioRead(&rdb,&byte,1) == 0) goto eoferr;
continue; /* Read next opcode. */
} else if (type == RDB_OPCODE_IDLE) {
/* IDLE: LRU idle time. */
if (rdbLoadLen(&rdb,NULL) == RDB_LENERR) goto eoferr;
continue; /* Read next opcode. */
} else if (type == RDB_OPCODE_EOF) { } else if (type == RDB_OPCODE_EOF) {
/* EOF: End of file, exit the main loop. */ /* EOF: End of file, exit the main loop. */
break; break;
@ -296,6 +299,7 @@ int redis_check_rdb(char *rdbfilename, FILE *fp) {
decrRefCount(key); decrRefCount(key);
decrRefCount(val); decrRefCount(val);
rdbstate.key_type = -1; rdbstate.key_type = -1;
expiretime = -1;
} }
/* Verify the checksum if RDB version is >= 5 */ /* Verify the checksum if RDB version is >= 5 */
if (rdbver >= 5 && server.rdb_checksum) { if (rdbver >= 5 && server.rdb_checksum) {