NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit0c400f1

committed

PersistHoldablePortal must establish the correct value for ActiveSnapshot

while completing execution of the cursor's query. Otherwise we get wronganswers or even crashes from non-volatile functions called by the query.Per report from andrew@supernews.

1 parent72fd559 commit0c400f1Copy full SHA for 0c400f1

File tree

1 file changed

-1

lines changed

src/backend/commands
- portalcmds.c

1 file changed

-1

lines changed

`‎src/backend/commands/portalcmds.c`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*`
`15`	`15`	`*`
`16`	`16`	`* IDENTIFICATION`
`17`		`- * $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.39 2005/03/25 21:57:58 tgl Exp $`
	`17`	`+ * $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.40 2005/04/11 15:59:34 tgl Exp $`
`18`	`18`	`*`
`19`	`19`	`*-------------------------------------------------------------------------`
`20`	`20`	`*/`
`@@ -309,6 +309,7 @@ PersistHoldablePortal(Portal portal)`
`309`	`309`	`{`
`310`	`310`	`QueryDesc*queryDesc=PortalGetQueryDesc(portal);`
`311`	`311`	`PortalsaveActivePortal;`
	`312`	`+SnapshotsaveActiveSnapshot;`
`312`	`313`	`ResourceOwnersaveResourceOwner;`
`313`	`314`	`MemoryContextsavePortalContext;`
`314`	`315`	`MemoryContextsaveQueryContext;`
`@@ -350,12 +351,14 @@ PersistHoldablePortal(Portal portal)`
`350`	`351`	`* Set up global portal context pointers.`
`351`	`352`	`*/`
`352`	`353`	`saveActivePortal=ActivePortal;`
	`354`	`+saveActiveSnapshot=ActiveSnapshot;`
`353`	`355`	`saveResourceOwner=CurrentResourceOwner;`
`354`	`356`	`savePortalContext=PortalContext;`
`355`	`357`	`saveQueryContext=QueryContext;`
`356`	`358`	`PG_TRY();`
`357`	`359`	`{`
`358`	`360`	`ActivePortal=portal;`
	`361`	`+ActiveSnapshot=queryDesc->snapshot;`
`359`	`362`	`CurrentResourceOwner=portal->resowner;`
`360`	`363`	`PortalContext=PortalGetHeapMemory(portal);`
`361`	`364`	`QueryContext=portal->queryContext;`
`@@ -428,6 +431,7 @@ PersistHoldablePortal(Portal portal)`
`428`	`431`
`429`	`432`	`/* Restore global vars and propagate error */`
`430`	`433`	`ActivePortal=saveActivePortal;`
	`434`	`+ActiveSnapshot=saveActiveSnapshot;`
`431`	`435`	`CurrentResourceOwner=saveResourceOwner;`
`432`	`436`	`PortalContext=savePortalContext;`
`433`	`437`	`QueryContext=saveQueryContext;`
`@@ -442,6 +446,7 @@ PersistHoldablePortal(Portal portal)`
`442`	`446`	`portal->status=PORTAL_READY;`
`443`	`447`
`444`	`448`	`ActivePortal=saveActivePortal;`
	`449`	`+ActiveSnapshot=saveActiveSnapshot;`
`445`	`450`	`CurrentResourceOwner=saveResourceOwner;`
`446`	`451`	`PortalContext=savePortalContext;`
`447`	`452`	`QueryContext=saveQueryContext;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit0c400f1

File tree

1 file changed

1 file changed

`‎src/backend/commands/portalcmds.c`

0 commit comments