database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-02 09:02:37 +03:00
Code Activity

Rename fields of DestReceiver to avoid collisions with (ill-considered)

Browse Source 
macros in some platforms' sys/socket.h.
This commit is contained in:
Tom Lane
2003-08-06 17:46:46 +00:00
parent d5f7d2c682
commit 338aa57be0
8 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/executor/execMain.c
View File

@ -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);

6
src/backend/executor/execTuples.c
View File

@ -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);

8
src/backend/executor/tstoreReceiver.c
View File

@ -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;