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

Cluster: use node->numslots instead of popcount() where possible.

Browse Source
This commit is contained in:
antirez 2013-02-28 15:13:32 +01:00
parent 4521115b17
commit d21d6b666f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cluster.c
View File

@ -1110,8 +1110,7 @@ void clusterSendPing(clusterLink *link, int type) {
*/ */
if (this == server.cluster->myself || if (this == server.cluster->myself ||
this->flags & (REDIS_NODE_HANDSHAKE|REDIS_NODE_NOADDR) || this->flags & (REDIS_NODE_HANDSHAKE|REDIS_NODE_NOADDR) ||
(this->link == NULL && (this->link == NULL && this->numslots == 0))
popcount(this->slots,sizeof(this->slots)) == 0))
{ {
freshnodes--; /* otherwise we may loop forever. */ freshnodes--; /* otherwise we may loop forever. */
continue; continue;
@ -1418,8 +1417,7 @@ void clusterUpdateState(void) {
while((de = dictNext(di)) != NULL) { while((de = dictNext(di)) != NULL) {
clusterNode *node = dictGetVal(de); clusterNode *node = dictGetVal(de);
if (node->flags & REDIS_NODE_MASTER && if (node->flags & REDIS_NODE_MASTER && node->numslots)
popcount(node->slots,sizeof(node->slots)))
server.cluster->size++; server.cluster->size++;
} }
dictReleaseIterator(di); dictReleaseIterator(di);