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

Remove redundant active placement filters and unneded sort operations 

If a query is router executable, it hits a single shard and therefore has a
single task associated with it. Therefore there is no need to sort the task list
that has a single element.

Also we already have a list of active shard placements, sending it in param
and reuse it.
pull/2723/head
Hanefi Onaldi 2019-05-22 14:54:52 +03:00
parent b935dfb8c8
commit 4d737177e6
No known key found for this signature in database
GPG Key ID: 95177DABDC09D1F5
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/distributed/planner/multi_physical_planner.c
View File

@ -174,7 +174,6 @@ static bool HasMergeTaskDependencies(List *sqlTaskList);
static List * GreedyAssignTaskList(List *taskList); static List * GreedyAssignTaskList(List *taskList);
static Task * GreedyAssignTask(WorkerNode *workerNode, List *taskList, static Task * GreedyAssignTask(WorkerNode *workerNode, List *taskList,
List *activeShardPlacementLists); List *activeShardPlacementLists);
static List * RoundRobinReorder(Task *task, List *placementList);
static List * ReorderAndAssignTaskList(List *taskList, static List * ReorderAndAssignTaskList(List *taskList,
List * (*reorderFunction)(Task *, List *)); List * (*reorderFunction)(Task *, List *));
static int CompareTasksByShardId(const void *leftElement, const void *rightElement); static int CompareTasksByShardId(const void *leftElement, const void *rightElement);
@ -5088,7 +5087,7 @@ RoundRobinAssignTaskList(List *taskList)
* Citus generates since the distributed transactionId is generated during the execution * Citus generates since the distributed transactionId is generated during the execution
* where as task-assignment happens duing the planning. * where as task-assignment happens duing the planning.
*/ */
static List * List *
RoundRobinReorder(Task *task, List *placementList) RoundRobinReorder(Task *task, List *placementList)
{ {
TransactionId transactionId = GetMyProcLocalTransactionId(); TransactionId transactionId = GetMyProcLocalTransactionId();

34
src/backend/distributed/planner/multi_router_planner.c
View File

@ -155,8 +155,10 @@ static bool RowLocksOnRelations(Node *node, List **rtiLockList);
static List * SingleShardModifyTaskList(Query *query, uint64 jobId, static List * SingleShardModifyTaskList(Query *query, uint64 jobId,
List *relationShardList, List *placementList, List *relationShardList, List *placementList,
uint64 shardId); uint64 shardId);
static void ReorderTaskPlacementsByTaskAssignmentPolicy(Job *job, TaskAssignmentPolicyType static void ReorderTaskPlacementsByTaskAssignmentPolicy(Job *job,
taskAssignmentPolicy); TaskAssignmentPolicyType
taskAssignmentPolicy,
List *placementList);
/* /*
@ -1640,7 +1642,8 @@ RouterJob(Query *originalQuery, PlannerRestrictionContext *plannerRestrictionCon
*/ */
if (shardId != INVALID_SHARD_ID) if (shardId != INVALID_SHARD_ID)
{ {
ReorderTaskPlacementsByTaskAssignmentPolicy(job, TaskAssignmentPolicy); ReorderTaskPlacementsByTaskAssignmentPolicy(job, TaskAssignmentPolicy,
placementList);
} }
} }
else if (isMultiShardModifyQuery) else if (isMultiShardModifyQuery)
@ -1673,12 +1676,31 @@ RouterJob(Query *originalQuery, PlannerRestrictionContext *plannerRestrictionCon
* By default it does not reorder the task list, implying a first-replica strategy. * By default it does not reorder the task list, implying a first-replica strategy.
*/ */
static void static void
ReorderTaskPlacementsByTaskAssignmentPolicy(Job *job, TaskAssignmentPolicyType ReorderTaskPlacementsByTaskAssignmentPolicy(Job *job,
taskAssignmentPolicy) TaskAssignmentPolicyType taskAssignmentPolicy,
List *placementList)
{ {
if (taskAssignmentPolicy == TASK_ASSIGNMENT_ROUND_ROBIN) if (taskAssignmentPolicy == TASK_ASSIGNMENT_ROUND_ROBIN)
{ {
job->taskList = RoundRobinAssignTaskList(job->taskList); Task *task = NULL;
List *reorderedPlacementList = NIL;
ShardPlacement *primaryPlacement = NULL;
/*
* We hit a single shard on router plans, and there should be only
* one task in the task list
*/
Assert(list_length(job->taskList) == 1);
task = (Task *) linitial(job->taskList);
/* reorder the placement list */
reorderedPlacementList = RoundRobinReorder(task, placementList);
task->taskPlacementList = reorderedPlacementList;
primaryPlacement = (ShardPlacement *) linitial(reorderedPlacementList);
ereport(DEBUG3, (errmsg("assigned task %u to node %s:%u", task->taskId,
primaryPlacement->nodeName,
primaryPlacement->nodePort)));
} }
} }

1
src/include/distributed/multi_physical_planner.h
View File

@ -351,6 +351,7 @@ extern List * TaskListDifference(const List *list1, const List *list2);
extern List * AssignAnchorShardTaskList(List *taskList); extern List * AssignAnchorShardTaskList(List *taskList);
extern List * FirstReplicaAssignTaskList(List *taskList); extern List * FirstReplicaAssignTaskList(List *taskList);
extern List * RoundRobinAssignTaskList(List *taskList); extern List * RoundRobinAssignTaskList(List *taskList);
extern List * RoundRobinReorder(Task *task, List *placementList);
extern int CompareTasksByTaskId(const void *leftElement, const void *rightElement); extern int CompareTasksByTaskId(const void *leftElement, const void *rightElement);
/* function declaration for creating Task */ /* function declaration for creating Task */