diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2005-11-03 17:11:40 +0000 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2005-11-03 17:11:40 +0000 |
| commit | 902377c465031947d747bb2e3912b22a92329b7f (patch) | |
| tree | 6586e15af12609b6135275d06d2339adc669a94e /src/backend/executor | |
| parent | 76c9ac8ebbba391c3062bf10cc6d8b187746b6eb (diff) | |
| download | postgresql-902377c465031947d747bb2e3912b22a92329b7f.tar.gz postgresql-902377c465031947d747bb2e3912b22a92329b7f.zip | |
Rename the members of CommandDest enum so they don't collide with other uses of
those names. (Debug and None were pretty bad names anyway.) I hope I catched
all uses of the names in comments too.
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/spi.c | 14 | ||||
| -rw-r--r-- | src/backend/executor/tstoreReceiver.c | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c index c4aef41a8d0..0b45fe49df2 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.143 2005/10/15 02:49:17 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.144 2005/11/03 17:11:36 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -984,8 +984,8 @@ void SPI_cursor_fetch(Portal portal, bool forward, long count) { _SPI_cursor_operation(portal, forward, count, - CreateDestReceiver(SPI, NULL)); - /* we know that the SPI receiver doesn't need a destroy call */ + CreateDestReceiver(DestSPI, NULL)); + /* we know that the DestSPI receiver doesn't need a destroy call */ } @@ -1418,7 +1418,7 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, const char *Nulls, if (!read_only) CommandCounterIncrement(); - dest = CreateDestReceiver(queryTree->canSetTag ? SPI : None, + dest = CreateDestReceiver(queryTree->canSetTag ? DestSPI : DestNone, NULL); if (snapshot == InvalidSnapshot) @@ -1527,7 +1527,7 @@ _SPI_pquery(QueryDesc *queryDesc, long tcount) res = SPI_OK_SELINTO; queryDesc->dest = None_Receiver; /* don't output results */ } - else if (queryDesc->dest->mydest != SPI) + else if (queryDesc->dest->mydest != DestSPI) { /* Don't return SPI_OK_SELECT if we're discarding result */ res = SPI_OK_UTILITY; @@ -1560,7 +1560,7 @@ _SPI_pquery(QueryDesc *queryDesc, long tcount) _SPI_current->processed = queryDesc->estate->es_processed; _SPI_current->lastoid = queryDesc->estate->es_lastoid; - if (operation == CMD_SELECT && queryDesc->dest->mydest == SPI) + if (operation == CMD_SELECT && queryDesc->dest->mydest == DestSPI) { if (_SPI_checktuples()) elog(ERROR, "consistency check on SPI tuple count failed"); @@ -1646,7 +1646,7 @@ _SPI_cursor_operation(Portal portal, bool forward, long count, */ _SPI_current->processed = nfetched; - if (dest->mydest == SPI && _SPI_checktuples()) + if (dest->mydest == DestSPI && _SPI_checktuples()) elog(ERROR, "consistency check on SPI tuple count failed"); /* Put the result into place for access by caller */ diff --git a/src/backend/executor/tstoreReceiver.c b/src/backend/executor/tstoreReceiver.c index 819fa962b04..90c34aeba6f 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 - * $PostgreSQL: pgsql/src/backend/executor/tstoreReceiver.c,v 1.14 2005/03/16 21:38:08 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/tstoreReceiver.c,v 1.15 2005/11/03 17:11:36 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -81,7 +81,7 @@ CreateTuplestoreDestReceiver(Tuplestorestate *tStore, self->pub.rStartup = tstoreStartupReceiver; self->pub.rShutdown = tstoreShutdownReceiver; self->pub.rDestroy = tstoreDestroyReceiver; - self->pub.mydest = Tuplestore; + self->pub.mydest = DestTuplestore; self->tstore = tStore; self->cxt = tContext; |