fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-31 14:51:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request from artix75/dev

Browse Source 
Cluster Manager: remove unused code elements
This commit is contained in:
Salvatore Sanfilippo 2019-01-25 11:47:45 +01:00 committed by GitHub
commit 5cc3b557f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 13 deletions

21
src/redis-cli.c

@ -1934,7 +1934,6 @@ typedef struct clusterManagerNode {
int flags; int flags;
list *flags_str; /* Flags string representations */ list *flags_str; /* Flags string representations */
sds replicate; /* Master ID if node is a slave */ sds replicate; /* Master ID if node is a slave */
list replicas;
int dirty; /* Node has changes that can be flushed */ int dirty; /* Node has changes that can be flushed */
uint8_t slots[CLUSTER_MANAGER_SLOTS]; uint8_t slots[CLUSTER_MANAGER_SLOTS];
int slots_count; int slots_count;
@ -2466,21 +2465,17 @@ static int clusterManagerGetAntiAffinityScore(clusterManagerNodeArray *ipnodes,
clusterManagerNode *node = node_array->nodes[j]; clusterManagerNode *node = node_array->nodes[j];
if (node == NULL) continue; if (node == NULL) continue;
if (!ip) ip = node->ip; if (!ip) ip = node->ip;
sds types, otypes; sds types;
// We always use the Master ID as key /* We always use the Master ID as key. */
sds key = (!node->replicate ? node->name : node->replicate); sds key = (!node->replicate ? node->name : node->replicate);
assert(key != NULL); assert(key != NULL);
dictEntry *entry = dictFind(related, key); dictEntry *entry = dictFind(related, key);
if (entry) otypes = (sds) dictGetVal(entry); if (entry) types = sdsdup((sds) dictGetVal(entry));
else { else types = sdsempty();
otypes = sdsempty(); /* Master type 'm' is always set as the first character of the
dictAdd(related, key, otypes); * types string. */
} if (!node->replicate) types = sdscatprintf(types, "m%s", types);
// Master type 'm' is always set as the first character of the else types = sdscat(types, "s");
// types string.
otypes = sdsdup(otypes);
if (!node->replicate) types = sdscatprintf(otypes, "m%s", otypes);
else types = sdscat(otypes, "s");
dictReplace(related, key, types); dictReplace(related, key, types);
} }
/* Now it's trivial to check, for each related group having the /* Now it's trivial to check, for each related group having the