From 8f0530f58061b185dc385df42e62d78a18d4ae3e Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 10 Apr 2017 13:51:29 -0400 Subject: Improve castNode notation by introducing list-extraction-specific variants. This extends the castNode() notation introduced by commit 5bcab1114 to provide, in one step, extraction of a list cell's pointer and coercion to a concrete node type. For example, "lfirst_node(Foo, lc)" is the same as "castNode(Foo, lfirst(lc))". Almost half of the uses of castNode that have appeared so far include a list extraction call, so this is pretty widely useful, and it saves a few more keystrokes compared to the old way. As with the previous patch, back-patch the addition of these macros to pg_list.h, so that the notation will be available when back-patching. Patch by me, after an idea of Andrew Gierth's. Discussion: https://postgr.es/m/14197.1491841216@sss.pgh.pa.us --- src/backend/executor/nodeAgg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/backend/executor/nodeAgg.c') diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 0109aee1fd8..c2b861828d3 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -2866,7 +2866,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags) if (phaseidx > 0) { - aggnode = castNode(Agg, list_nth(node->chain, phaseidx - 1)); + aggnode = list_nth_node(Agg, node->chain, phaseidx - 1); sortnode = castNode(Sort, aggnode->plan.lefttree); } else @@ -3360,7 +3360,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags) */ foreach(arg, pertrans->aggref->args) { - TargetEntry *source_tle = castNode(TargetEntry, lfirst(arg)); + TargetEntry *source_tle = lfirst_node(TargetEntry, arg); TargetEntry *tle; tle = flatCopyTargetEntry(source_tle); -- cgit v1.2.3