diff options
Diffstat (limited to 'src/backend/executor/execMain.c')
| -rw-r--r-- | src/backend/executor/execMain.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 4228a8f9969..22ba7880ae5 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.261 2005/11/22 18:17:10 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.262 2005/12/02 20:03:40 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -52,13 +52,6 @@ #include "utils/memutils.h" -typedef struct execRowMark -{ - Relation relation; - Index rti; - char resname[32]; -} execRowMark; - typedef struct evalPlanQual { Index rti; @@ -567,10 +560,10 @@ InitPlan(QueryDesc *queryDesc, bool explainOnly) Index rti = lfirst_int(l); Oid relid = getrelid(rti, rangeTable); Relation relation; - execRowMark *erm; + ExecRowMark *erm; relation = heap_open(relid, RowShareLock); - erm = (execRowMark *) palloc(sizeof(execRowMark)); + erm = (ExecRowMark *) palloc(sizeof(ExecRowMark)); erm->relation = relation; erm->rti = rti; snprintf(erm->resname, sizeof(erm->resname), "ctid%u", rti); @@ -1020,7 +1013,7 @@ ExecEndPlan(PlanState *planstate, EState *estate) */ foreach(l, estate->es_rowMarks) { - execRowMark *erm = lfirst(l); + ExecRowMark *erm = lfirst(l); heap_close(erm->relation, NoLock); } @@ -1165,7 +1158,7 @@ lnext: ; lmark: ; foreach(l, estate->es_rowMarks) { - execRowMark *erm = lfirst(l); + ExecRowMark *erm = lfirst(l); HeapTupleData tuple; Buffer buffer; ItemPointerData update_ctid; @@ -1859,9 +1852,9 @@ EvalPlanQual(EState *estate, Index rti, relation = NULL; foreach(l, estate->es_rowMarks) { - if (((execRowMark *) lfirst(l))->rti == rti) + if (((ExecRowMark *) lfirst(l))->rti == rti) { - relation = ((execRowMark *) lfirst(l))->relation; + relation = ((ExecRowMark *) lfirst(l))->relation; break; } } |