NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit9f4f0a0

committed

Fix incorrect logic in HaveRegisteredOrActiveSnapshot().

This function gave the wrong answer when there's more than oneRegisteredSnapshots entry, whether or not any of them is theCatalogSnapshot. This leads to assertion failure in some scenariosinvolving fetching toasted data using a cursor. (As per discussion,I'm dubious that this is the right contract to be enforcing at all;but it surely doesn't help to be enforcing it incorrectly.)Fetching toasted data using a cursor is evidently under-tested,so add a test case too.Per report from Erik Rijkers. This is new code, so no need forback-patch.Discussion:https://postgr.es/m/dc9dd229-ed30-6c62-4c41-d733ffff776b@xs4all.nl

1 parenta17fd67 commit9f4f0a0Copy full SHA for 9f4f0a0

File tree

3 files changed

+52

-3

lines changed

src
- backend/utils/time
  - snapmgr.c
- test/regress
  - expected
    - portals.out
  - sql
    - portals.sql

3 files changed

+52

-3

lines changed

`‎src/backend/utils/time/snapmgr.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1646,11 +1646,11 @@ HaveRegisteredOrActiveSnapshot(void)`
`1646`	`1646`	`* removed at any time due to invalidation processing. If explicitly`
`1647`	`1647`	`* registered more than one snapshot has to be in RegisteredSnapshots.`
`1648`	`1648`	`*/`
`1649`		`-if (pairingheap_is_empty(&RegisteredSnapshots)\|\|`
`1650`		`-!pairingheap_is_singular(&RegisteredSnapshots))`
	`1649`	`+if (CatalogSnapshot!=NULL&&`
	`1650`	`+pairingheap_is_singular(&RegisteredSnapshots))`
`1651`	`1651`	`return false;`
`1652`	`1652`
`1653`		`-returnCatalogSnapshot==NULL;`
	`1653`	`+return!pairingheap_is_empty(&RegisteredSnapshots);`
`1654`	`1654`	`}`
`1655`	`1655`
`1656`	`1656`

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!

Commit9f4f0a0

File tree

3 files changed

3 files changed

`‎src/backend/utils/time/snapmgr.c`

0 commit comments