Commite2605c8

committed

Add a warning to AtEOXact_SPI() to catch cases where the current

transaction has been committed without SPI_finish() being calledfirst. Per recent discussion here:http://archives.postgresql.org/pgsql-patches/2003-11/msg00286.php

1 parent0fd336c commite2605c8Copy full SHA for e2605c8

File tree

+17

-9

lines changed

+17

-9

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.157 2003/11/29 19:51:40 pgsql Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.158 2003/12/02 19:26:47 joe Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`*Transaction aborts can now occur two ways:`
`@@ -977,7 +977,7 @@ CommitTransaction(void)`
`977`	`977`
`978`	`978`	`CallEOXactCallbacks(true);`
`979`	`979`	`AtEOXact_GUC(true);`
`980`		`-AtEOXact_SPI();`
	`980`	`+AtEOXact_SPI(true);`
`981`	`981`	`AtEOXact_gist();`
`982`	`982`	`AtEOXact_hash();`
`983`	`983`	`AtEOXact_nbtree();`
`@@ -1087,7 +1087,7 @@ AbortTransaction(void)`
`1087`	`1087`
`1088`	`1088`	`CallEOXactCallbacks(false);`
`1089`	`1089`	`AtEOXact_GUC(false);`
`1090`		`-AtEOXact_SPI();`
	`1090`	`+AtEOXact_SPI(false);`
`1091`	`1091`	`AtEOXact_gist();`
`1092`	`1092`	`AtEOXact_hash();`
`1093`	`1093`	`AtEOXact_nbtree();`

Lines changed: 12 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.108 2003/11/29 19:51:48 pgsql Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.109 2003/12/02 19:26:47 joe Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -174,18 +174,26 @@ SPI_finish(void)`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`/*`
`177`		`- * Clean up SPI state at transaction commit or abort (we don't care which).`
	`177`	`+ * Clean up SPI state at transaction commit or abort.`
`178`	`178`	`*/`
`179`	`179`	`void`
`180`		`-AtEOXact_SPI(void)`
	`180`	`+AtEOXact_SPI(boolisCommit)`
`181`	`181`	`{`
`182`	`182`	`/*`
`183`	`183`	`* Note that memory contexts belonging to SPI stack entries will be`
`184`	`184`	`* freed automatically, so we can ignore them here. We just need to`
`185`	`185`	`* restore our static variables to initial state.`
`186`	`186`	`*/`
`187`		`-if (_SPI_stack!=NULL)/* there was abort */`
	`187`	`+if (_SPI_stack!=NULL)`
	`188`	`+{`
`188`	`189`	`free(_SPI_stack);`
	`190`	`+if (isCommit)`
	`191`	`+ereport(WARNING,`
	`192`	`+(errcode(ERRCODE_WARNING),`
	`193`	`+errmsg("freeing non-empty SPI stack"),`
	`194`	`+errhint("Check for missing \"SPI_finish\" calls")));`
	`195`	`+}`
	`196`	`+`
`189`	`197`	`_SPI_current=_SPI_stack=NULL;`
`190`	`198`	`_SPI_connected=_SPI_curid=-1;`
`191`	`199`	`SPI_processed=0;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`*`
`3`	`3`	`* spi.h`
`4`	`4`	`*`
`5`		`- * $PostgreSQL: pgsql/src/include/executor/spi.h,v 1.40 2003/11/29 22:41:01 pgsql Exp $`
	`5`	`+ * $PostgreSQL: pgsql/src/include/executor/spi.h,v 1.41 2003/12/02 19:26:47 joe Exp $`
`6`	`6`	`*`
`7`	`7`	`*-------------------------------------------------------------------------`
`8`	`8`	`*/`
`@@ -116,6 +116,6 @@ extern void SPI_cursor_fetch(Portal portal, bool forward, int count);`
`116`	`116`	`externvoidSPI_cursor_move(Portalportal,boolforward,intcount);`
`117`	`117`	`externvoidSPI_cursor_close(Portalportal);`
`118`	`118`
`119`		`-externvoidAtEOXact_SPI(void);`
	`119`	`+externvoidAtEOXact_SPI(boolisCommit);`
`120`	`120`
`121`	`121`	`#endif/* SPI_H */`

Comments

(0)