Commita5c46d9

committed

更新 redis.c 中关于持久化的部分

1 parent7442437 commita5c46d9Copy full SHA for a5c46d9

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2934,11 +2934,13 @@ int checkForSentinelMode(int argc, char **argv) {`
`2934`	`2934`	`// 从 RDB 文件或 AOF 文件中载入数据到内存`
`2935`	`2935`	`voidloadDataFromDisk(void) {`
`2936`	`2936`	`long longstart=ustime();`
`2937`		`-// AOF 开启，并且有 AOF 文件时，优先使用 AOF 来还原`
	`2937`	`+`
	`2938`	`+// 如果开启了 AOF 功能，那么优先使用 AOF 文件来还原数据`
`2938`	`2939`	`if (server.aof_state==REDIS_AOF_ON) {`
`2939`	`2940`	`if (loadAppendOnlyFile(server.aof_filename)==REDIS_OK)`
`2940`	`2941`	`redisLog(REDIS_NOTICE,"DB loaded from append only file: %.3f seconds",(float)(ustime()-start)/1000000);`
`2941`	`2942`	`}else {`
	`2943`	`+// 在没有开启 AOF 功能时，才使用 RDB 来还原`
`2942`	`2944`	`if (rdbLoad(server.rdb_filename)==REDIS_OK) {`
`2943`	`2945`	`redisLog(REDIS_NOTICE,"DB loaded from disk: %.3f seconds",`
`2944`	`2946`	`(float)(ustime()-start)/1000000);`

Comments

(0)