diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-04-06 16:34:07 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-04-06 16:34:07 +0000 |
| commit | ad161bcc8a3792d18ef2f3ebe66bb1e22d42b6f2 (patch) | |
| tree | 18ec8963fbd1d6dd62ad214bfe3552fc2e7d06eb /src/backend/executor/nodeSubplan.c | |
| parent | 0f3748a28c42d09d794ff00af3f1f992eaa5fd7c (diff) | |
| download | postgresql-ad161bcc8a3792d18ef2f3ebe66bb1e22d42b6f2.tar.gz postgresql-ad161bcc8a3792d18ef2f3ebe66bb1e22d42b6f2.zip | |
Merge Resdom nodes into TargetEntry nodes to simplify code and save a
few palloc's. I also chose to eliminate the restype and restypmod fields
entirely, since they are redundant with information stored in the node's
contained expression; re-examining the expression at need seems simpler
and more reliable than trying to keep restype/restypmod up to date.
initdb forced due to change in contents of stored rules.
Diffstat (limited to 'src/backend/executor/nodeSubplan.c')
| -rw-r--r-- | src/backend/executor/nodeSubplan.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index 7d40fe8b1ed..de3187e2472 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeSubplan.c,v 1.67 2005/03/16 21:38:08 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeSubplan.c,v 1.68 2005/04/06 16:34:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -828,12 +828,10 @@ ExecInitSubPlan(SubPlanState *node, EState *estate) /* Process lefthand argument */ exstate = (ExprState *) linitial(fstate->args); expr = exstate->expr; - tle = makeTargetEntry(makeResdom(i, - exprType((Node *) expr), - exprTypmod((Node *) expr), - NULL, - false), - expr); + tle = makeTargetEntry(expr, + i, + NULL, + false); tlestate = makeNode(GenericExprState); tlestate->xprstate.expr = (Expr *) tle; tlestate->xprstate.evalfunc = NULL; @@ -844,12 +842,10 @@ ExecInitSubPlan(SubPlanState *node, EState *estate) /* Process righthand argument */ exstate = (ExprState *) lsecond(fstate->args); expr = exstate->expr; - tle = makeTargetEntry(makeResdom(i, - exprType((Node *) expr), - exprTypmod((Node *) expr), - NULL, - false), - expr); + tle = makeTargetEntry(expr, + i, + NULL, + false); tlestate = makeNode(GenericExprState); tlestate->xprstate.expr = (Expr *) tle; tlestate->xprstate.evalfunc = NULL; |