mirror of
https://github.com/postgres/postgres.git
synced 2025-06-11 20:28:21 +03:00
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.
This commit is contained in:
@ -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;
|
||||
|
Reference in New Issue
Block a user