Commit4acc97d

Neil Conway

committed

Assert that BufferIsPinned() in IncrBufferRefCount(), rather than using

a home-brewed combination of assertions that boiled down to the samething.

1 parentdec2c77 commit4acc97dCopy full SHA for 4acc97d

File tree

-10

lines changed

-10

lines changed

Lines changed: 3 additions & 10 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/storage/buffer/bufmgr.c,v 1.181 2004/10/17 22:01:50 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.182 2004/11/24 02:56:17 neilc Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1549,25 +1549,18 @@ ReleaseBuffer(Buffer buffer)`
`1549`	`1549`	`*at least once.`
`1550`	`1550`	`*`
`1551`	`1551`	`*This function cannot be used on a buffer we do not have pinned,`
`1552`		`- *because it doesn't change the shared buffer state. Therefore the`
`1553`		`- *Assert checks are for refcount > 0. Someone got this wrong once...`
	`1552`	`+ *because it doesn't change the shared buffer state.`
`1554`	`1553`	`*/`
`1555`	`1554`	`void`
`1556`	`1555`	`IncrBufferRefCount(Bufferbuffer)`
`1557`	`1556`	`{`
`1558`		`-Assert(BufferIsValid(buffer));`
	`1557`	`+Assert(BufferIsPinned(buffer));`
`1559`	`1558`	`ResourceOwnerEnlargeBuffers(CurrentResourceOwner);`
`1560`	`1559`	`ResourceOwnerRememberBuffer(CurrentResourceOwner,buffer);`
`1561`	`1560`	`if (BufferIsLocal(buffer))`
`1562`		`-{`
`1563`		`-Assert(LocalRefCount[-buffer-1]>0);`
`1564`	`1561`	`LocalRefCount[-buffer-1]++;`
`1565`		`-}`
`1566`	`1562`	`else`
`1567`		`-{`
`1568`		`-Assert(PrivateRefCount[buffer-1]>0);`
`1569`	`1563`	`PrivateRefCount[buffer-1]++;`
`1570`		`-}`
`1571`	`1564`	`}`
`1572`	`1565`
`1573`	`1566`	`#ifdefNOT_USED`

Comments

(0)