Unverified Commit 3c9f5954 authored by CoolThi's avatar CoolThi Committed by GitHub
Browse files

Remove variable expired in expireSlaveKeys() to prevent confusing the compiler (#13299)

This change prevents missed optimization for some compilers:
https://godbolt.org/z/W66h86E13 (the reduced intermediate form in
optimization).
parent 3b1b1d14
...@@ -465,12 +465,10 @@ void expireSlaveKeys(void) { ...@@ -465,12 +465,10 @@ void expireSlaveKeys(void) {
if ((dbids & 1) != 0) { if ((dbids & 1) != 0) {
redisDb *db = server.db+dbid; redisDb *db = server.db+dbid;
dictEntry *expire = dbFindExpires(db, keyname); dictEntry *expire = dbFindExpires(db, keyname);
int expired = 0;
if (expire && if (expire &&
activeExpireCycleTryExpire(server.db+dbid,expire,start)) activeExpireCycleTryExpire(server.db+dbid,expire,start))
{ {
expired = 1;
/* Propagate the DEL (writable replicas do not propagate anything to other replicas, /* Propagate the DEL (writable replicas do not propagate anything to other replicas,
* but they might propagate to AOF) and trigger module hooks. */ * but they might propagate to AOF) and trigger module hooks. */
postExecutionUnitOperations(); postExecutionUnitOperations();
...@@ -480,7 +478,7 @@ void expireSlaveKeys(void) { ...@@ -480,7 +478,7 @@ void expireSlaveKeys(void) {
* corresponding bit in the new bitmap we set as value. * corresponding bit in the new bitmap we set as value.
* At the end of the loop if the bitmap is zero, it means we * At the end of the loop if the bitmap is zero, it means we
* no longer need to keep track of this key. */ * no longer need to keep track of this key. */
if (expire && !expired) { else if (expire) {
noexpire++; noexpire++;
new_dbids |= (uint64_t)1 << dbid; new_dbids |= (uint64_t)1 << dbid;
} }
......
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