mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-23 19:39:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of SPI_tuptable.

Browse Source
This commit is contained in:
Vadim B. Mikheev 1997-09-25 12:16:05 +00:00
parent be5241420a
commit bb0cc20e64
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/backend/executor/spi.c
View File

@ -60,7 +60,7 @@ static int _SPI_begin_call(bool execmem);
static int _SPI_end_call(bool procmem); static int _SPI_end_call(bool procmem);
static MemoryContext _SPI_execmem(void); static MemoryContext _SPI_execmem(void);
static MemoryContext _SPI_procmem(void); static MemoryContext _SPI_procmem(void);
static bool _SPI_checktuples(bool isRetrieveIntoRelation); static bool _SPI_checktuples(void);
#ifdef SPI_EXECUTOR_STATS #ifdef SPI_EXECUTOR_STATS
extern int ShowExecutorStats; extern int ShowExecutorStats;
@ -774,19 +774,16 @@ _SPI_execute_plan(_SPI_plan * plan, Datum * Values, char *Nulls, int tcount)
static int static int
_SPI_pquery(QueryDesc * queryDesc, EState * state, int tcount) _SPI_pquery(QueryDesc * queryDesc, EState * state, int tcount)
{ {
Query *parseTree; Query *parseTree = queryDesc->parsetree;
Plan *plan; Plan *plan = queryDesc->plantree;
int operation; int operation = queryDesc->operation;
CommandDest dest = queryDesc->dest;
TupleDesc tupdesc; TupleDesc tupdesc;
bool isRetrieveIntoPortal = false; bool isRetrieveIntoPortal = false;
bool isRetrieveIntoRelation = false; bool isRetrieveIntoRelation = false;
char *intoName = NULL; char *intoName = NULL;
int res; int res;
parseTree = queryDesc->parsetree;
plan = queryDesc->plantree;
operation = queryDesc->operation;
switch (operation) switch (operation)
{ {
case CMD_SELECT: case CMD_SELECT:
@ -804,6 +801,7 @@ _SPI_pquery(QueryDesc * queryDesc, EState * state, int tcount)
{ {
res = SPI_OK_SELINTO; res = SPI_OK_SELINTO;
isRetrieveIntoRelation = true; isRetrieveIntoRelation = true;
queryDesc->dest = None; /* */
} }
break; break;
case CMD_INSERT: case CMD_INSERT:
@ -844,7 +842,7 @@ _SPI_pquery(QueryDesc * queryDesc, EState * state, int tcount)
_SPI_current->processed = state->es_processed; _SPI_current->processed = state->es_processed;
if (operation == CMD_SELECT && queryDesc->dest == SPI) if (operation == CMD_SELECT && queryDesc->dest == SPI)
{ {
if (_SPI_checktuples(isRetrieveIntoRelation)) if (_SPI_checktuples())
elog(FATAL, "SPI_select: # of processed tuples check failed"); elog(FATAL, "SPI_select: # of processed tuples check failed");
} }
@ -858,11 +856,12 @@ _SPI_pquery(QueryDesc * queryDesc, EState * state, int tcount)
} }
#endif #endif
if (queryDesc->dest == SPI) if (dest == SPI)
{ {
SPI_processed = _SPI_current->processed; SPI_processed = _SPI_current->processed;
SPI_tuptable = _SPI_current->tuptable; SPI_tuptable = _SPI_current->tuptable;
} }
queryDesc->dest = dest;
return (res); return (res);
@ -898,7 +897,7 @@ _SPI_fetch(FetchStmt * stmt)
* context */ * context */
_SPI_current->processed = state->es_processed; _SPI_current->processed = state->es_processed;
if (_SPI_checktuples(false)) if (_SPI_checktuples())
elog(FATAL, "SPI_fetch: # of processed tuples check failed"); elog(FATAL, "SPI_fetch: # of processed tuples check failed");
SPI_processed = _SPI_current->processed; SPI_processed = _SPI_current->processed;
@ -982,7 +981,7 @@ _SPI_end_call(bool procmem)
} }
static bool static bool
_SPI_checktuples(bool isRetrieveIntoRelation) _SPI_checktuples()
{ {
uint32 processed = _SPI_current->processed; uint32 processed = _SPI_current->processed;
SPITupleTable *tuptable = _SPI_current->tuptable; SPITupleTable *tuptable = _SPI_current->tuptable;
@ -993,15 +992,9 @@ _SPI_checktuples(bool isRetrieveIntoRelation)
if (tuptable != NULL) if (tuptable != NULL)
failed = true; failed = true;
} }
else else /* some tuples were processed */
/* some tuples were processed */
{ {
if (tuptable == NULL) /* spi_printtup was not called */ if (tuptable == NULL) /* spi_printtup was not called */
{
if (!isRetrieveIntoRelation)
failed = true;
}
else if (isRetrieveIntoRelation)
failed = true; failed = true;
else if (processed != (tuptable->alloced - tuptable->free)) else if (processed != (tuptable->alloced - tuptable->free))
failed = true; failed = true;