diff options
| author | Tom Lane | 2017-04-10 17:51:29 +0000 |
|---|---|---|
| committer | Tom Lane | 2017-04-10 17:51:53 +0000 |
| commit | 8f0530f58061b185dc385df42e62d78a18d4ae3e (patch) | |
| tree | 63d038ae4012dcdcff3b556dde4c654959f8448e /src/backend/executor/nodeSubplan.c | |
| parent | 56dd8e85c40fef3e3c2c10afa186ee30416ec507 (diff) | |
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/[email protected]
Diffstat (limited to 'src/backend/executor/nodeSubplan.c')
| -rw-r--r-- | src/backend/executor/nodeSubplan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index b3a025879a1..e8fa4c8547c 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -817,7 +817,7 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent) i = 1; foreach(l, oplist) { - OpExpr *opexpr = castNode(OpExpr, lfirst(l)); + OpExpr *opexpr = lfirst_node(OpExpr, l); Expr *expr; TargetEntry *tle; Oid rhs_eq_oper; @@ -1148,7 +1148,7 @@ ExecInitAlternativeSubPlan(AlternativeSubPlan *asplan, PlanState *parent) */ foreach(lc, asplan->subplans) { - SubPlan *sp = castNode(SubPlan, lfirst(lc)); + SubPlan *sp = lfirst_node(SubPlan, lc); SubPlanState *sps = ExecInitSubPlan(sp, parent); asstate->subplans = lappend(asstate->subplans, sps); @@ -1197,8 +1197,8 @@ ExecAlternativeSubPlan(AlternativeSubPlanState *node, bool *isNull) { /* Just pass control to the active subplan */ - SubPlanState *activesp = castNode(SubPlanState, - list_nth(node->subplans, node->active)); + SubPlanState *activesp = list_nth_node(SubPlanState, + node->subplans, node->active); return ExecSubPlan(activesp, econtext, isNull); } |