NotificationsYou must be signed in to change notification settings
Fork4.9k
Star17.7k

Commitf6ff75f

committed

Make BufferIsExclusiveLocked and BufferIsDirty work for local buffers.

These functions tried to check the state of the buffer's content lockeven for local buffers. Since we don't use the content lock for alocal buffer, that would lead to a "false" result fromLWLockHeldByMeInMode, which would mean a misleading "false" answerfrom BufferIsExclusiveLocked (we'd rather that case always return"true") or an assertion failure in BufferIsDirty.The core code never applies these two functions to local buffers,and apparently no extensions do either, since we've not heardcomplaints. Still, in the name of future-proofing, let's fixthem to act as though a pinned local buffer is content-locked.Author: Srinath Reddy <srinath2133@gmail.com>Discussion:https://postgr.es/m/19396ef77f8.1098c4a1810508.2255483659262451647@zohocorp.com

1 parent128897b commitf6ff75fCopy full SHA for f6ff75f

File tree

1 file changed

+11

-11

lines changed

src/backend/storage/buffer
- bufmgr.c

1 file changed

+11

-11

lines changed

`‎src/backend/storage/buffer/bufmgr.c`

Lines changed: 11 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -2472,20 +2472,19 @@ BufferIsExclusiveLocked(Buffer buffer)`
`2472`	`2472`	`{`
`2473`	`2473`	`BufferDesc*bufHdr;`
`2474`	`2474`
	`2475`	`+Assert(BufferIsPinned(buffer));`
	`2476`	`+`
`2475`	`2477`	`if (BufferIsLocal(buffer))`
`2476`	`2478`	`{`
`2477`		`-intbufid=-buffer-1;`
`2478`		`-`
`2479`		`-bufHdr=GetLocalBufferDescriptor(bufid);`
	`2479`	`+/* Content locks are not maintained for local buffers. */`
	`2480`	`+return true;`
`2480`	`2481`	`}`
`2481`	`2482`	`else`
`2482`	`2483`	`{`
`2483`	`2484`	`bufHdr=GetBufferDescriptor(buffer-1);`
	`2485`	`+returnLWLockHeldByMeInMode(BufferDescriptorGetContentLock(bufHdr),`
	`2486`	`+LW_EXCLUSIVE);`
`2484`	`2487`	`}`
`2485`		`-`
`2486`		`-Assert(BufferIsPinned(buffer));`
`2487`		`-returnLWLockHeldByMeInMode(BufferDescriptorGetContentLock(bufHdr),`
`2488`		`-LW_EXCLUSIVE);`
`2489`	`2488`	`}`
`2490`	`2489`
`2491`	`2490`	`/*`
`@@ -2501,21 +2500,22 @@ BufferIsDirty(Buffer buffer)`
`2501`	`2500`	`{`
`2502`	`2501`	`BufferDesc*bufHdr;`
`2503`	`2502`
	`2503`	`+Assert(BufferIsPinned(buffer));`
	`2504`	`+`
`2504`	`2505`	`if (BufferIsLocal(buffer))`
`2505`	`2506`	`{`
`2506`	`2507`	`intbufid=-buffer-1;`
`2507`	`2508`
`2508`	`2509`	`bufHdr=GetLocalBufferDescriptor(bufid);`
	`2510`	`+/* Content locks are not maintained for local buffers. */`
`2509`	`2511`	`}`
`2510`	`2512`	`else`
`2511`	`2513`	`{`
`2512`	`2514`	`bufHdr=GetBufferDescriptor(buffer-1);`
	`2515`	`+Assert(LWLockHeldByMeInMode(BufferDescriptorGetContentLock(bufHdr),`
	`2516`	`+LW_EXCLUSIVE));`
`2513`	`2517`	`}`
`2514`	`2518`
`2515`		`-Assert(BufferIsPinned(buffer));`
`2516`		`-Assert(LWLockHeldByMeInMode(BufferDescriptorGetContentLock(bufHdr),`
`2517`		`-LW_EXCLUSIVE));`
`2518`		`-`
`2519`	`2519`	`returnpg_atomic_read_u32(&bufHdr->state)&BM_DIRTY;`
`2520`	`2520`	`}`
`2521`	`2521`

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!

Commitf6ff75f

File tree

1 file changed

1 file changed

`‎src/backend/storage/buffer/bufmgr.c`

0 commit comments