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

preserve modified query and planner context for inlined planning

pull/6876/head
aykutbozkurt 2023-04-24 17:11:28 +03:00
parent a6a7271e63
commit c660d01ae3
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -809,8 +809,8 @@ InlineCtesAndCreateDistributedPlannedStmt(uint64 planId,
{ {
/* /*
* We'll inline the CTEs and try distributed planning, preserve the original * We'll inline the CTEs and try distributed planning, preserve the original
* query in case the planning fails and we fallback to recursive planning of * query ,the modified query, and planner context in case the planning fails
* CTEs. * and we fallback to recursive planning of CTEs.
*/ */
Query *copyOfOriginalQuery = copyObject(planContext->originalQuery); Query *copyOfOriginalQuery = copyObject(planContext->originalQuery);
@ -819,13 +819,21 @@ InlineCtesAndCreateDistributedPlannedStmt(uint64 planId,
/* after inlining, we shouldn't have any inlinable CTEs */ /* after inlining, we shouldn't have any inlinable CTEs */
Assert(!QueryTreeContainsInlinableCTE(copyOfOriginalQuery)); Assert(!QueryTreeContainsInlinableCTE(copyOfOriginalQuery));
/* recompute modified query and planner context after we inlined the query */
PlannerRestrictionContext *plannerContextForInlinedQuery =
CreateAndPushPlannerRestrictionContext();
Query *copyOfInlinedOriginalQuery = copyObject(copyOfOriginalQuery);
standard_planner(copyOfInlinedOriginalQuery, NULL, 0, planContext->boundParams);
Query *modifiedInlinedQuery = copyOfInlinedOriginalQuery;
/* simply recurse into CreateDistributedPlannedStmt() in a PG_TRY() block */ /* simply recurse into CreateDistributedPlannedStmt() in a PG_TRY() block */
PlannedStmt *result = TryCreateDistributedPlannedStmt(planContext->plan, PlannedStmt *result = TryCreateDistributedPlannedStmt(planContext->plan,
copyOfOriginalQuery, copyOfOriginalQuery,
planContext->query, modifiedInlinedQuery,
planContext->boundParams, planContext->boundParams,
planContext-> plannerContextForInlinedQuery);
plannerRestrictionContext);
PopPlannerRestrictionContext();
return result; return result;
} }