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

update pg and citus

moonshot/custom-path
Nils Dijk 2021-01-04 19:07:25 +01:00
parent b5ac6d2048
commit 6bc9209baf
No known key found for this signature in database
GPG Key ID: CA1177EF9434F241
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/distributed/planner/distributed_planner.c
View File

@ -141,7 +141,12 @@ distributed_planner(Query *parse,
{
if (UseCustomPath)
{
return standard_planner(parse, cursorOptions, boundParams);
return standard_planner(parse,
#if PG_VERSION_NUM >= PG_VERSION_13
query_string,
#endif
cursorOptions,
boundParams);
}
bool needsDistributedPlanning = false;

14
src/backend/distributed/planner/path_based_planner.c
View File

@ -151,7 +151,7 @@ CreateDistributedUnionPlan(PlannerInfo *root,
initStringInfo(&buf);
pg_get_query_def(qc, &buf);
Task *sqlTask = CreateBasicTask(workerJob->jobId, i, SELECT_TASK, buf.data);
Task *sqlTask = CreateBasicTask(workerJob->jobId, i, READ_TASK, buf.data);
sqlTask->anchorShardId = shardInterval->shardId;
sqlTask->taskPlacementList = ActiveShardPlacementList(shardInterval->shardId);
workerJob->taskList = lappend(workerJob->taskList, sqlTask);
@ -163,7 +163,7 @@ CreateDistributedUnionPlan(PlannerInfo *root,
distributedPlan->workerJob = workerJob;
distributedPlan->modLevel = ROW_MODIFY_READONLY;
distributedPlan->relationIdList = list_make1_oid(distUnion->sampleRelid);
distributedPlan->hasReturning = true;
distributedPlan->expectResults = true;
Plan *subPlan = NULL;
int subPlanCount = 0;
@ -302,12 +302,13 @@ PathBasedPlannerRelationHook(PlannerInfo *root,
foreach(pathCell, relOptInfo->pathlist)
{
Path *originalPath = lfirst(pathCell);
pathCell->data.ptr_value =
WrapTableAccessWithDistributedUnion(originalPath,
CustomPath *wrappedPath = WrapTableAccessWithDistributedUnion(
originalPath,
TableColocationId(rte->relid),
partitionValue,
rte->relid,
NIL);
SetListCellPtr(pathCell, wrappedPath);
}
}
@ -923,8 +924,9 @@ PathBasedPlannerGroupAgg(PlannerInfo *root,
ListCell *pathCell = NULL;
foreach(pathCell, output_rel->pathlist)
{
Path *originalPath = pathCell->data.ptr_value;
pathCell->data.ptr_value = OptimizeGroupAgg(root, originalPath);
Path *originalPath = lfirst(pathCell);
Path *optimizedGroupAdd = OptimizeGroupAgg(root, originalPath);
SetListCellPtr(pathCell, optimizedGroupAdd);
}
}