diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-12-14 00:17:59 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-12-14 00:17:59 +0000 |
| commit | 2d8d66628a8ac49deba8483608135b3c358ae729 (patch) | |
| tree | 95f321c5fc2035b5110317e25b0449e85065c8a5 /src/backend/nodes/copyfuncs.c | |
| parent | 29cdab3d531b6f612ab53b93dbb34a131e9cdb1c (diff) | |
| download | postgresql-2d8d66628a8ac49deba8483608135b3c358ae729.tar.gz postgresql-2d8d66628a8ac49deba8483608135b3c358ae729.zip | |
Clean up plantree representation of SubPlan-s --- SubLink does not appear
in the planned representation of a subplan at all any more, only SubPlan.
This means subselect.c doesn't scribble on its input anymore, which seems
like a good thing; and there are no longer three different possible
interpretations of a SubLink. Simplify node naming and improve comments
in primnodes.h. No change to stored rules, though.
Diffstat (limited to 'src/backend/nodes/copyfuncs.c')
| -rw-r--r-- | src/backend/nodes/copyfuncs.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index d84e6061246..c3abcfc9e80 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -15,7 +15,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.232 2002/12/13 19:45:56 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.233 2002/12/14 00:17:50 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -818,21 +818,22 @@ _copySubLink(SubLink *from) } /* - * _copySubPlanExpr + * _copySubPlan */ -static SubPlanExpr * -_copySubPlanExpr(SubPlanExpr *from) +static SubPlan * +_copySubPlan(SubPlan *from) { - SubPlanExpr *newnode = makeNode(SubPlanExpr); + SubPlan *newnode = makeNode(SubPlan); - COPY_SCALAR_FIELD(typeOid); + COPY_SCALAR_FIELD(subLinkType); + COPY_SCALAR_FIELD(useor); + COPY_NODE_FIELD(oper); COPY_NODE_FIELD(plan); COPY_SCALAR_FIELD(plan_id); COPY_NODE_FIELD(rtable); COPY_INTLIST_FIELD(setParam); COPY_INTLIST_FIELD(parParam); COPY_NODE_FIELD(args); - COPY_NODE_FIELD(sublink); return newnode; } @@ -2431,8 +2432,8 @@ copyObject(void *from) case T_SubLink: retval = _copySubLink(from); break; - case T_SubPlanExpr: - retval = _copySubPlanExpr(from); + case T_SubPlan: + retval = _copySubPlan(from); break; case T_FieldSelect: retval = _copyFieldSelect(from); |