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

Remove distinction between SQL_TASK and ROUTER_TASK (#3243) 

Remove distinction between SQL_TASK and ROUTER_TASK
pull/3248/head
Marco Slot 2019-11-29 14:54:50 +01:00 committed by GitHub
parent aeec3d1544 16d1ad3666
commit cb7105d1dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1161,10 +1161,10 @@ TaskListRequires2PC(List *taskList)
bool
ReadOnlyTask(TaskType taskType)
{
if (taskType == ROUTER_TASK || taskType == SQL_TASK)
if (taskType == SELECT_TASK)
{
/*
* TODO: We currently do not execute modifying CTEs via ROUTER_TASK/SQL_TASK.
* TODO: We currently do not execute modifying CTEs via SELECT_TASK.
* When we implement it, we should either not use the mentioned task types for
* modifying CTEs detect them here.
*/
@ -1606,8 +1606,7 @@ ExecutionOrderForTask(RowModifyLevel modLevel, Task *task)
{
switch (task->taskType)
{
case SQL_TASK:
case ROUTER_TASK:
case SELECT_TASK:
{
return EXECUTION_ORDER_ANY;
}

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

@ -639,7 +639,7 @@ TopLevelTask(Task *task)
* SQL tasks can only appear at the top level in our query tree. Further, no
* other task type can appear at the top level in our tree.
*/
if (task->taskType == SQL_TASK)
if (task->taskType == SELECT_TASK)
{
topLevelTask = true;
}
@ -1067,7 +1067,7 @@ ManageTaskExecution(TaskTracker *taskTracker, TaskTracker *sourceTaskTracker,
* We finally queue this task for execution. Note that we queue sql and
* other tasks slightly differently.
*/
if (taskType == SQL_TASK)
if (taskType == SELECT_TASK)
{
TrackerQueueSqlTask(taskTracker, task);
}
@ -1257,7 +1257,7 @@ ManageTransmitExecution(TaskTracker *transmitTracker,
TransmitExecStatus *transmitStatusArray = taskExecution->transmitStatusArray;
TransmitExecStatus currentTransmitStatus = transmitStatusArray[currentNodeIndex];
TransmitExecStatus nextTransmitStatus = EXEC_TRANSMIT_INVALID_FIRST;
Assert(task->taskType == SQL_TASK);
Assert(task->taskType == SELECT_TASK);
switch (currentTransmitStatus)
{
@ -1857,7 +1857,7 @@ ConstrainedNonMergeTaskList(List *taskAndExecutionList, Task *task)
List *dependentTaskList = NIL;
TaskType taskType = task->taskType;
if (taskType == SQL_TASK || taskType == MAP_TASK)
if (taskType == SELECT_TASK || taskType == MAP_TASK)
{
upstreamTask = task;
dependentTaskList = upstreamTask->dependentTaskList;
@ -1935,7 +1935,7 @@ ConstrainedMergeTaskList(List *taskAndExecutionList, Task *task)
* given task is a SQL or map task, we simply need to find its merge task
* dependencies -- if any.
*/
if (taskType == SQL_TASK || taskType == MAP_TASK)
if (taskType == SELECT_TASK || taskType == MAP_TASK)
{
constrainedMergeTaskList = MergeTaskList(task->dependentTaskList);
}
@ -2017,7 +2017,7 @@ ReassignTaskList(List *taskList)
TaskExecution *taskExecution = task->taskExecution;
bool transmitCompleted = TransmitExecutionCompleted(taskExecution);
if ((task->taskType == SQL_TASK) && transmitCompleted)
if ((task->taskType == SELECT_TASK) && transmitCompleted)
{
completedTaskList = lappend(completedTaskList, task);
}

2
src/backend/distributed/planner/function_call_delegation.c
View File

@ -370,7 +370,7 @@ TryToDelegateFunctionCall(Query *query, bool *hasExternParam)
pg_get_query_def(query, queryString);
task = CitusMakeNode(Task);
task->taskType = SQL_TASK;
task->taskType = SELECT_TASK;
task->queryString = queryString->data;
task->taskPlacementList = placementList;
task->anchorShardId = shardInterval->shardId;

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

@ -2044,7 +2044,7 @@ BuildJobTreeTaskList(Job *jobTree, PlannerRestrictionContext *plannerRestriction
sqlTaskList = QueryPushdownSqlTaskList(job->jobQuery, job->jobId,
plannerRestrictionContext->
relationRestrictionContext,
prunedRelationShardList, SQL_TASK,
prunedRelationShardList, SELECT_TASK,
false);
}
else
@ -2441,7 +2441,7 @@ QueryPushdownTaskCreate(Query *originalQuery, int shardIndex,
Task *subqueryTask = CreateBasicTask(jobId, taskId, taskType, NULL);
if ((taskType == MODIFY_TASK && !modifyRequiresMasterEvaluation) ||
taskType == SQL_TASK)
taskType == SELECT_TASK)
{
pg_get_query_def(taskQuery, queryString);
ereport(DEBUG4, (errmsg("distributed statement: %s",
@ -2704,7 +2704,7 @@ SqlTaskList(Job *job)
StringInfo sqlQueryString = makeStringInfo();
pg_get_query_def(taskQuery, sqlQueryString);
Task *sqlTask = CreateBasicTask(jobId, taskIdIndex, SQL_TASK,
Task *sqlTask = CreateBasicTask(jobId, taskIdIndex, SELECT_TASK,
sqlQueryString->data);
sqlTask->dependentTaskList = dataFetchTaskList;
sqlTask->relationShardList = BuildRelationShardList(fragmentRangeTableList,
@ -5404,7 +5404,7 @@ AssignDataFetchDependencies(List *taskList)
ListCell *dependentTaskCell = NULL;
Assert(task->taskPlacementList != NIL);
Assert(task->taskType == SQL_TASK || task->taskType == MERGE_TASK);
Assert(task->taskType == SELECT_TASK || task->taskType == MERGE_TASK);
foreach(dependentTaskCell, dependentTaskList)
{

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

@ -1807,7 +1807,7 @@ SingleShardSelectTaskList(Query *query, uint64 jobId, List *relationShardList,
List *placementList,
uint64 shardId)
{
Task *task = CreateTask(ROUTER_TASK);
Task *task = CreateTask(SELECT_TASK);
StringInfo queryString = makeStringInfo();
List *relationRowLockList = NIL;

2
src/backend/distributed/transaction/relation_access_tracking.c
View File

@ -287,7 +287,7 @@ RecordParallelRelationAccessForTaskList(List *taskList)
*/
Task *firstTask = linitial(taskList);
if (firstTask->taskType == SQL_TASK)
if (firstTask->taskType == SELECT_TASK)
{
RecordRelationParallelSelectAccessForTask(firstTask);
}

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

@ -77,16 +77,15 @@ typedef enum
/* Enumeration that defines different task types */
typedef enum
{
TASK_TYPE_INVALID_FIRST = 0,
SQL_TASK = 1,
MAP_TASK = 2,
MERGE_TASK = 3,
MAP_OUTPUT_FETCH_TASK = 4,
MERGE_FETCH_TASK = 5,
MODIFY_TASK = 6,
ROUTER_TASK = 7,
DDL_TASK = 8,
VACUUM_ANALYZE_TASK = 9
TASK_TYPE_INVALID_FIRST,
SELECT_TASK,
MAP_TASK,
MERGE_TASK,
MAP_OUTPUT_FETCH_TASK,
MERGE_FETCH_TASK,
MODIFY_TASK,
DDL_TASK,
VACUUM_ANALYZE_TASK
} TaskType;