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/nodeAgg.c | |
| parent | 2503982be4ca48f48d2bb6e1d46160b23e4bb268 (diff) | |
| download | postgresql-40f42d2a34329b0b71a1287d6fd2554298dbb713.tar.gz | |
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/nodeAgg.c')
| -rw-r--r-- | src/backend/executor/nodeAgg.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 9ff0eff6d7..4a8af7b3a7 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -2053,6 +2053,7 @@ void ExecReScanAgg(AggState *node) { ExprContext *econtext = node->ss.ps.ps_ExprContext; + PlanState *outerPlan = outerPlanState(node); int aggno; node->agg_done = false; @@ -2075,7 +2076,7 @@ ExecReScanAgg(AggState *node) * parameter changes, then we can just rescan the existing hash table; * no need to build it again. */ - if (node->ss.ps.lefttree->chgParam == NULL) + if (outerPlan->chgParam == NULL) { ResetTupleHashIterator(node->hashtable, &node->hashiter); return; @@ -2133,8 +2134,8 @@ ExecReScanAgg(AggState *node) * if chgParam of subnode is not null then plan will be re-scanned by * first ExecProcNode. */ - if (node->ss.ps.lefttree->chgParam == NULL) - ExecReScan(node->ss.ps.lefttree); + if (outerPlan->chgParam == NULL) + ExecReScan(outerPlan); } |