diff options
Diffstat (limited to 'src/backend/executor')
-rw-r--r-- | src/backend/executor/execMain.c | 6 | ||||
-rw-r--r-- | src/backend/executor/execTuples.c | 6 | ||||
-rw-r--r-- | src/backend/executor/tstoreReceiver.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 55d81f0b677..e76f294c05f 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.214 2003/08/04 02:39:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.215 2003/08/06 17:46:45 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -217,7 +217,7 @@ ExecutorRun(QueryDesc *queryDesc, estate->es_processed = 0; estate->es_lastoid = InvalidOid; - (*dest->startup) (dest, operation, queryDesc->tupDesc); + (*dest->rStartup) (dest, operation, queryDesc->tupDesc); /* * run plan @@ -235,7 +235,7 @@ ExecutorRun(QueryDesc *queryDesc, /* * shutdown receiver */ - (*dest->shutdown) (dest); + (*dest->rShutdown) (dest); MemoryContextSwitchTo(oldcontext); diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c index 8fbacc3342d..8bc1e5899f9 100644 --- a/src/backend/executor/execTuples.c +++ b/src/backend/executor/execTuples.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.69 2003/08/04 02:39:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.70 2003/08/06 17:46:45 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -764,7 +764,7 @@ begin_tup_output_tupdesc(DestReceiver *dest, TupleDesc tupdesc) tstate->metadata = TupleDescGetAttInMetadata(tupdesc); tstate->dest = dest; - (*tstate->dest->startup) (tstate->dest, (int) CMD_SELECT, tupdesc); + (*tstate->dest->rStartup) (tstate->dest, (int) CMD_SELECT, tupdesc); return tstate; } @@ -817,7 +817,7 @@ do_text_output_multiline(TupOutputState *tstate, char *text) void end_tup_output(TupOutputState *tstate) { - (*tstate->dest->shutdown) (tstate->dest); + (*tstate->dest->rShutdown) (tstate->dest); /* note that destroying the dest is not ours to do */ /* XXX worth cleaning up the attinmetadata? */ pfree(tstate); diff --git a/src/backend/executor/tstoreReceiver.c b/src/backend/executor/tstoreReceiver.c index beba70bab23..aeda0d13d54 100644 --- a/src/backend/executor/tstoreReceiver.c +++ b/src/backend/executor/tstoreReceiver.c @@ -9,7 +9,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/tstoreReceiver.c,v 1.8 2003/08/04 02:39:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/tstoreReceiver.c,v 1.9 2003/08/06 17:46:45 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -78,9 +78,9 @@ CreateTuplestoreDestReceiver(Tuplestorestate *tStore, TStoreState *self = (TStoreState *) palloc(sizeof(TStoreState)); self->pub.receiveTuple = tstoreReceiveTuple; - self->pub.startup = tstoreStartupReceiver; - self->pub.shutdown = tstoreShutdownReceiver; - self->pub.destroy = tstoreDestroyReceiver; + self->pub.rStartup = tstoreStartupReceiver; + self->pub.rShutdown = tstoreShutdownReceiver; + self->pub.rDestroy = tstoreDestroyReceiver; self->pub.mydest = Tuplestore; self->tstore = tStore; |