database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-21 16:02:15 +03:00
Code Activity

Remove stray references to lefttree/righttree in the executor.

Browse Source 
The general convention in the executor is to refer to child plans
and planstates via the outerPlan[State] and innerPlan[State]
macros, but a few places didn't do it like that.  For consistency
and readability, convert all the stragglers to use the macros.
(See also commit 40f42d2a3, which did some similar cleanup a few
years ago, but missed these cases.)

Richard Guo

Discussion: https://postgr.es/m/CAMbWs4-vYhh1xsa_veah4PUed2Xq=Ed_YH3=Mqt5A3Y=EgfCEg@mail.gmail.com
This commit is contained in:
Tom Lane
2022-07-07 11:23:40 -04:00
parent 62c46eee22
commit 8821054210
14 changed files with 56 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend/executor/nodeMergejoin.c
View File

@ -1658,6 +1658,9 @@ ExecEndMergeJoin(MergeJoinState *node)
void
ExecReScanMergeJoin(MergeJoinState *node)
{
PlanState *outerPlan = outerPlanState(node);
PlanState *innerPlan = innerPlanState(node);
ExecClearTuple(node->mj_MarkedTupleSlot);
node->mj_JoinState = EXEC_MJ_INITIALIZE_OUTER;
@ -1670,8 +1673,8 @@ ExecReScanMergeJoin(MergeJoinState *node)
* if chgParam of subnodes is not null then plans will be re-scanned by
* first ExecProcNode.
*/
if (node->js.ps.lefttree->chgParam == NULL)
ExecReScan(node->js.ps.lefttree);
if (node->js.ps.righttree->chgParam == NULL)
ExecReScan(node->js.ps.righttree);
if (outerPlan->chgParam == NULL)
ExecReScan(outerPlan);
if (innerPlan->chgParam == NULL)
ExecReScan(innerPlan);
}