external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4053 from citusdata/unify_node_comparisions 

Unify node sort ordering
pull/4052/head
Önder Kalacı 2020-07-22 11:23:18 +02:00 committed by GitHub
parent 40405cd978 ff6555299c
commit d03c4aff2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/distributed/executor/adaptive_executor.c
View File

@ -1931,16 +1931,8 @@ WorkerPoolCompare(const void *lhsKey, const void *rhsKey)
const WorkerPool *workerLhs = *(const WorkerPool **) lhsKey;
const WorkerPool *workerRhs = *(const WorkerPool **) rhsKey;
int nameCompare = strncmp(workerLhs->nodeName, workerRhs->nodeName,
WORKER_LENGTH);
if (nameCompare != 0)
{
return nameCompare;
}
int portCompare = workerLhs->nodePort - workerRhs->nodePort;
return portCompare;
return NodeNamePortCompare(workerLhs->nodeName, workerRhs->nodeName,
workerLhs->nodePort, workerRhs->nodePort);
}

21
src/backend/distributed/operations/worker_node_manager.c
View File

@ -584,15 +584,30 @@ WorkerNodeCompare(const void *lhsKey, const void *rhsKey, Size keySize)
const WorkerNode *workerLhs = (const WorkerNode *) lhsKey;
const WorkerNode *workerRhs = (const WorkerNode *) rhsKey;
return NodeNamePortCompare(workerLhs->workerName, workerRhs->workerName,
workerLhs->workerPort, workerRhs->workerPort);
}
int nameCompare = strncmp(workerLhs->workerName, workerRhs->workerName,
WORKER_LENGTH);
/*
* NodeNamePortCompare implements the common logic for comparing two nodes
* with their given nodeNames and ports.
*
* This function is useful for ensuring consistency of sort operations between
* different representations of nodes in the cluster such as WorkerNode and
* WorkerPool.
*/
int
NodeNamePortCompare(const char *workerLhsName, const char *workerRhsName,
int workerLhsPort, int workerRhsPort)
{
int nameCompare = strncmp(workerLhsName, workerRhsName, WORKER_LENGTH);
if (nameCompare != 0)
{
return nameCompare;
}
int portCompare = workerLhs->workerPort - workerRhs->workerPort;
int portCompare = workerLhsPort - workerRhsPort;
return portCompare;
}

2
src/include/distributed/worker_manager.h
View File

@ -96,5 +96,7 @@ extern WorkerNode * GetFirstPrimaryWorkerNode(void);
/* Function declarations for worker node utilities */
extern int CompareWorkerNodes(const void *leftElement, const void *rightElement);
extern int WorkerNodeCompare(const void *lhsKey, const void *rhsKey, Size keySize);
extern int NodeNamePortCompare(const char *workerLhsName, const char *workerRhsName,
int workerLhsPort, int workerRhsPort);
#endif /* WORKER_MANAGER_H */