Rename RemoveCoordinatorPlacement (#4125)

RemoveCoordinatorPlacement does not do what it says. It removes the
coordinator placement only if there are other placements, so it is not a
single node, and only if the coordinator has a placement.
pull/4122/head
SaitTalhaNisanci 2020-08-26 13:12:10 +03:00 committed by GitHub
parent 2ca8d2fb33
commit f7c2af0411
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions

View File

@ -164,7 +164,7 @@ static List * SingleShardTaskList(Query *query, uint64 jobId,
List *relationShardList, List *placementList, List *relationShardList, List *placementList,
uint64 shardId, bool parametersInQueryResolved); uint64 shardId, bool parametersInQueryResolved);
static bool RowLocksOnRelations(Node *node, List **rtiLockList); static bool RowLocksOnRelations(Node *node, List **rtiLockList);
static List * RemoveCoordinatorPlacement(List *placementList); static List * RemoveCoordinatorPlacementIfNotSingleNode(List *placementList);
static void ReorderTaskPlacementsByTaskAssignmentPolicy(Job *job, static void ReorderTaskPlacementsByTaskAssignmentPolicy(Job *job,
TaskAssignmentPolicyType TaskAssignmentPolicyType
taskAssignmentPolicy, taskAssignmentPolicy,
@ -1814,7 +1814,7 @@ ReorderTaskPlacementsByTaskAssignmentPolicy(Job *job,
* connect to the worker nodes. * connect to the worker nodes.
*/ */
Assert(ReadOnlyTask(task->taskType)); Assert(ReadOnlyTask(task->taskType));
placementList = RemoveCoordinatorPlacement(placementList); placementList = RemoveCoordinatorPlacementIfNotSingleNode(placementList);
/* reorder the placement list */ /* reorder the placement list */
List *reorderedPlacementList = RoundRobinReorder(placementList); List *reorderedPlacementList = RoundRobinReorder(placementList);
@ -1830,14 +1830,14 @@ ReorderTaskPlacementsByTaskAssignmentPolicy(Job *job,
/* /*
* RemoveCoordinatorPlacement gets a task placement list and returns the list * RemoveCoordinatorPlacementIfNotSingleNode gets a task placement list and returns the list
* by removing the placement belonging to the coordinator (if any). * by removing the placement belonging to the coordinator (if any).
* *
* If the list has a single entry or no placements on the coordinator, the list * If the list has a single element or no placements on the coordinator, the list
* is return unmodified. * returned is unmodified.
*/ */
static List * static List *
RemoveCoordinatorPlacement(List *placementList) RemoveCoordinatorPlacementIfNotSingleNode(List *placementList)
{ {
ListCell *placementCell = NULL; ListCell *placementCell = NULL;