remove unused boundary type (#6563)

Removes unused job boundary tag `SUBQUERY_MAP_MERGE_JOB`.

Only usage is at `BuildMapMergeJob`, which is only called when the
boundary = `JOIN_MAP_MERGE_JOB`. Hence, it should be safe to remove.
revert-6281
aykut-bozkurt 2022-12-16 18:19:22 +03:00 committed by GitHub
parent f7e881a4c4
commit 9c0073ba57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 11 deletions

View File

@ -316,11 +316,6 @@ BuildJobTree(MultiTreeRoot *multiTree)
boundaryNodeJobType = JOIN_MAP_MERGE_JOB; boundaryNodeJobType = JOIN_MAP_MERGE_JOB;
} }
} }
else if (currentNodeType == T_MultiPartition &&
parentNodeType == T_MultiExtendedOp)
{
boundaryNodeJobType = SUBQUERY_MAP_MERGE_JOB;
}
else if (currentNodeType == T_MultiCollect && else if (currentNodeType == T_MultiCollect &&
parentNodeType != T_MultiPartition) parentNodeType != T_MultiPartition)
{ {
@ -1954,10 +1949,7 @@ BuildMapMergeJob(Query *jobQuery, List *dependentJobList, Var *partitionKey,
Var *partitionColumn = copyObject(partitionKey); Var *partitionColumn = copyObject(partitionKey);
/* update the logical partition key's table and column identifiers */ /* update the logical partition key's table and column identifiers */
if (boundaryNodeJobType != SUBQUERY_MAP_MERGE_JOB) UpdateColumnAttributes(partitionColumn, rangeTableList, dependentJobList);
{
UpdateColumnAttributes(partitionColumn, rangeTableList, dependentJobList);
}
MapMergeJob *mapMergeJob = CitusMakeNode(MapMergeJob); MapMergeJob *mapMergeJob = CitusMakeNode(MapMergeJob);
mapMergeJob->job.jobId = UniqueJobId(); mapMergeJob->job.jobId = UniqueJobId();

View File

@ -95,8 +95,7 @@ typedef enum
{ {
JOB_INVALID_FIRST = 0, JOB_INVALID_FIRST = 0,
JOIN_MAP_MERGE_JOB = 1, JOIN_MAP_MERGE_JOB = 1,
SUBQUERY_MAP_MERGE_JOB = 2, TOP_LEVEL_WORKER_JOB = 2
TOP_LEVEL_WORKER_JOB = 3
} BoundaryNodeJobType; } BoundaryNodeJobType;