Commit3e76a80

committed

Move some bitmap logic out of bitmapset.c

Move the logic for selecting appropriate pg_bitutils.hfunctions based on word size to bitmapset.h for widervisibility.Reviewed (in a previous version) by Tom LaneDiscussion:https://postgr.es/m/CAFBsxsFW2JjTo58jtDB%2B3sZhxMx3t-3evew8%3DAcr%2BGGhC%2BkFaA%40mail.gmail.com

1 parent9f225e9 commit3e76a80Copy full SHA for 3e76a80

File tree

+13

-13

lines changed

+13

-13

lines changed

Lines changed: 0 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,19 +71,6 @@`
`71`	`71`
`72`	`72`	`#defineHAS_MULTIPLE_ONES(x)((bitmapword) RIGHTMOST_ONE(x) != (x))`
`73`	`73`
`74`		`-/* Select appropriate bit-twiddling functions for bitmap word size */`
`75`		`-#ifBITS_PER_BITMAPWORD==32`
`76`		`-#definebmw_leftmost_one_pos(w)pg_leftmost_one_pos32(w)`
`77`		`-#definebmw_rightmost_one_pos(w)pg_rightmost_one_pos32(w)`
`78`		`-#definebmw_popcount(w)pg_popcount32(w)`
`79`		`-#elifBITS_PER_BITMAPWORD==64`
`80`		`-#definebmw_leftmost_one_pos(w)pg_leftmost_one_pos64(w)`
`81`		`-#definebmw_rightmost_one_pos(w)pg_rightmost_one_pos64(w)`
`82`		`-#definebmw_popcount(w)pg_popcount64(w)`
`83`		`-#else`
`84`		`-#error "invalid BITS_PER_BITMAPWORD"`
`85`		`-#endif`
`86`		`-`
`87`	`74`	`#ifdefUSE_ASSERT_CHECKING`
`88`	`75`	`/*`
`89`	`76`	`* bms_is_valid_set - for cassert builds to check for valid sets`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,19 @@ typedef enum`
`73`	`73`	`BMS_MULTIPLE,/* >1 member */`
`74`	`74`	`}BMS_Membership;`
`75`	`75`
	`76`	`+/* Select appropriate bit-twiddling functions for bitmap word size */`
	`77`	`+#ifBITS_PER_BITMAPWORD==32`
	`78`	`+#definebmw_leftmost_one_pos(w)pg_leftmost_one_pos32(w)`
	`79`	`+#definebmw_rightmost_one_pos(w)pg_rightmost_one_pos32(w)`
	`80`	`+#definebmw_popcount(w)pg_popcount32(w)`
	`81`	`+#elifBITS_PER_BITMAPWORD==64`
	`82`	`+#definebmw_leftmost_one_pos(w)pg_leftmost_one_pos64(w)`
	`83`	`+#definebmw_rightmost_one_pos(w)pg_rightmost_one_pos64(w)`
	`84`	`+#definebmw_popcount(w)pg_popcount64(w)`
	`85`	`+#else`
	`86`	`+#error "invalid BITS_PER_BITMAPWORD"`
	`87`	`+#endif`
	`88`	`+`
`76`	`89`
`77`	`90`	`/*`
`78`	`91`	`* function prototypes in nodes/bitmapset.c`

Comments

(0)