From ad161bcc8a3792d18ef2f3ebe66bb1e22d42b6f2 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 6 Apr 2005 16:34:07 +0000 Subject: 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. --- src/backend/executor/execQual.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/backend/executor/execQual.c') diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index 9d915af91a5..67c962398e8 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.175 2005/03/29 00:16:59 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.176 2005/04/06 16:34:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -3467,7 +3467,7 @@ ExecCleanTargetListLength(List *targetlist) TargetEntry *curTle = (TargetEntry *) lfirst(tl); Assert(IsA(curTle, TargetEntry)); - if (!curTle->resdom->resjunk) + if (!curTle->resjunk) len++; } return len; @@ -3516,7 +3516,7 @@ ExecTargetList(List *targetlist, { GenericExprState *gstate = (GenericExprState *) lfirst(tl); TargetEntry *tle = (TargetEntry *) gstate->xprstate.expr; - AttrNumber resind = tle->resdom->resno - 1; + AttrNumber resind = tle->resno - 1; values[resind] = ExecEvalExpr(gstate->arg, econtext, @@ -3568,7 +3568,7 @@ ExecTargetList(List *targetlist, { GenericExprState *gstate = (GenericExprState *) lfirst(tl); TargetEntry *tle = (TargetEntry *) gstate->xprstate.expr; - AttrNumber resind = tle->resdom->resno - 1; + AttrNumber resind = tle->resno - 1; if (itemIsDone[resind] == ExprEndResult) { @@ -3602,7 +3602,7 @@ ExecTargetList(List *targetlist, { GenericExprState *gstate = (GenericExprState *) lfirst(tl); TargetEntry *tle = (TargetEntry *) gstate->xprstate.expr; - AttrNumber resind = tle->resdom->resno - 1; + AttrNumber resind = tle->resno - 1; while (itemIsDone[resind] == ExprMultipleResult) { -- cgit v1.2.3