diff options
| author | Robert Haas <rhaas@postgresql.org> | 2015-05-04 16:13:07 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2015-05-04 16:17:36 -0400 |
| commit | 40f42d2a34329b0b71a1287d6fd2554298dbb713 (patch) | |
| tree | fb9a2cf0acfd47b94a2ff72f1757fd978353f1f6 /src/backend/executor/nodeGroup.c | |
| parent | 2503982be4ca48f48d2bb6e1d46160b23e4bb268 (diff) | |
| download | postgresql-40f42d2a34329b0b71a1287d6fd2554298dbb713.tar.gz postgresql-40f42d2a34329b0b71a1287d6fd2554298dbb713.zip | |
Use outerPlanState macro instead of referring to leffttree.
This makes the executor code more consistent. It also removes
an apparently superfluous NULL test in nodeGroup.c.
Qingqing Zhou, reviewed by Tom Lane, and further revised by me.
Diffstat (limited to 'src/backend/executor/nodeGroup.c')
| -rw-r--r-- | src/backend/executor/nodeGroup.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c index 83d562e5119..3f87716b8f1 100644 --- a/src/backend/executor/nodeGroup.c +++ b/src/backend/executor/nodeGroup.c @@ -280,6 +280,8 @@ ExecEndGroup(GroupState *node) void ExecReScanGroup(GroupState *node) { + PlanState *outerPlan = outerPlanState(node); + node->grp_done = FALSE; node->ss.ps.ps_TupFromTlist = false; /* must clear first tuple */ @@ -289,7 +291,6 @@ ExecReScanGroup(GroupState *node) * if chgParam of subnode is not null then plan will be re-scanned by * first ExecProcNode. */ - if (node->ss.ps.lefttree && - node->ss.ps.lefttree->chgParam == NULL) - ExecReScan(node->ss.ps.lefttree); + if (outerPlan->chgParam == NULL) + ExecReScan(outerPlan); } |