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/outfuncs.c | |
| parent | 29cdab3d531b6f612ab53b93dbb34a131e9cdb1c (diff) | |
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/outfuncs.c')
| -rw-r--r-- | src/backend/nodes/outfuncs.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index a688b471e79..97fc9462a27 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.189 2002/12/13 19:45:56 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.190 2002/12/14 00:17:52 tgl Exp $ * * NOTES * Every node type that can appear in stored rules' parsetrees *must* @@ -665,18 +665,19 @@ _outSubLink(StringInfo str, SubLink *node) } static void -_outSubPlanExpr(StringInfo str, SubPlanExpr *node) +_outSubPlan(StringInfo str, SubPlan *node) { - WRITE_NODE_TYPE("SUBPLANEXPR"); + WRITE_NODE_TYPE("SUBPLAN"); - WRITE_OID_FIELD(typeOid); + WRITE_ENUM_FIELD(subLinkType, SubLinkType); + WRITE_BOOL_FIELD(useor); + WRITE_NODE_FIELD(oper); WRITE_NODE_FIELD(plan); WRITE_INT_FIELD(plan_id); WRITE_NODE_FIELD(rtable); WRITE_INTLIST_FIELD(setParam); WRITE_INTLIST_FIELD(parParam); WRITE_NODE_FIELD(args); - WRITE_NODE_FIELD(sublink); } static void @@ -1498,8 +1499,8 @@ _outNode(StringInfo str, void *obj) case T_SubLink: _outSubLink(str, obj); break; - case T_SubPlanExpr: - _outSubPlanExpr(str, obj); + case T_SubPlan: + _outSubPlan(str, obj); break; case T_FieldSelect: _outFieldSelect(str, obj); |