NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd63d957

committed

Convert macros to static inline functions (block.h)

Remove BlockIdIsValid(), which wasn't used and is unnecessary.Remove BlockIdCopy(), which wasn't used and can be done by structassignment.(BlockIdEquals() also isn't used, but seems reasonable to keeparound.)Reviewed-by: Amul Sul <sulamul@gmail.com>Discussion:https://www.postgresql.org/message-id/flat/5b558da8-99fb-0a99-83dd-f72f05388517%40enterprisedb.com

1 parent495ed0e commitd63d957Copy full SHA for d63d957

File tree

1 file changed

+23

-30

lines changed

src/include/storage
- block.h

1 file changed

+23

-30

lines changed

`‎src/include/storage/block.h`

Lines changed: 23 additions & 30 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,57 +59,50 @@ typedef struct BlockIdData`
`59`	`59`	`typedefBlockIdDataBlockId;/ block identifier */`
`60`	`60`
`61`	`61`	`/* ----------------`
`62`		`- *supportmacros`
	`62`	`+ *supportfunctions`
`63`	`63`	`* ----------------`
`64`	`64`	`*/`
`65`	`65`
`66`	`66`	`/*`
`67`	`67`	`* BlockNumberIsValid`
`68`	`68`	`*True iff blockNumber is valid.`
`69`	`69`	`*/`
`70`		`-#defineBlockNumberIsValid(blockNumber) \`
`71`		`-((BlockNumber) (blockNumber) != InvalidBlockNumber)`
`72`		`-`
`73`		`-/*`
`74`		`- * BlockIdIsValid`
`75`		`- *True iff the block identifier is valid.`
`76`		`- */`
`77`		`-#defineBlockIdIsValid(blockId) \`
`78`		`-PointerIsValid(blockId)`
	`70`	`+staticinlinebool`
	`71`	`+BlockNumberIsValid(BlockNumberblockNumber)`
	`72`	`+{`
	`73`	`+returnblockNumber!=InvalidBlockNumber;`
	`74`	`+}`
`79`	`75`
`80`	`76`	`/*`
`81`	`77`	`* BlockIdSet`
`82`	`78`	`*Sets a block identifier to the specified value.`
`83`	`79`	`*/`
`84`		`-#defineBlockIdSet(blockId,blockNumber) \`
`85`		`-( \`
`86`		`-(blockId)->bi_hi = (blockNumber) >> 16, \`
`87`		`-(blockId)->bi_lo = (blockNumber) & 0xffff \`
`88`		`-)`
`89`		`-`
`90`		`-/*`
`91`		`- * BlockIdCopy`
`92`		`- *Copy a block identifier.`
`93`		`- */`
`94`		`-#defineBlockIdCopy(toBlockId,fromBlockId) \`
`95`		`-( \`
`96`		`-(toBlockId)->bi_hi = (fromBlockId)->bi_hi, \`
`97`		`-(toBlockId)->bi_lo = (fromBlockId)->bi_lo \`
`98`		`-)`
	`80`	`+staticinlinevoid`
	`81`	`+BlockIdSet(BlockIdData*blockId,BlockNumberblockNumber)`
	`82`	`+{`
	`83`	`+blockId->bi_hi=blockNumber >>16;`
	`84`	`+blockId->bi_lo=blockNumber&0xffff;`
	`85`	`+}`
`99`	`86`
`100`	`87`	`/*`
`101`	`88`	`* BlockIdEquals`
`102`	`89`	`*Check for block number equality.`
`103`	`90`	`*/`
`104`		`-#defineBlockIdEquals(blockId1,blockId2) \`
`105`		`-((blockId1)->bi_hi == (blockId2)->bi_hi && \`
`106`		`- (blockId1)->bi_lo == (blockId2)->bi_lo)`
	`91`	`+staticinlinebool`
	`92`	`+BlockIdEquals(constBlockIdDatablockId1,constBlockIdDatablockId2)`
	`93`	`+{`
	`94`	`+return (blockId1->bi_hi==blockId2->bi_hi&&`
	`95`	`+blockId1->bi_lo==blockId2->bi_lo);`
	`96`	`+}`
`107`	`97`
`108`	`98`	`/*`
`109`	`99`	`* BlockIdGetBlockNumber`
`110`	`100`	`*Retrieve the block number from a block identifier.`
`111`	`101`	`*/`
`112`		`-#defineBlockIdGetBlockNumber(blockId) \`
`113`		`-((((BlockNumber) (blockId)->bi_hi) << 16) \| ((BlockNumber) (blockId)->bi_lo))`
	`102`	`+staticinlineBlockNumber`
	`103`	`+BlockIdGetBlockNumber(constBlockIdData*blockId)`
	`104`	`+{`
	`105`	`+return (((BlockNumber)blockId->bi_hi) <<16) \| ((BlockNumber)blockId->bi_lo);`
	`106`	`+}`
`114`	`107`
`115`	`108`	`#endif/* BLOCK_H */`

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!

Commitd63d957

File tree

1 file changed

1 file changed

`‎src/include/storage/block.h`

0 commit comments