NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commitaf4472b

committed

Change various Gin*Is* macros to return 0/1.

Returning the direct result of bit arithmetic, in a macro intended to beused in a boolean manner, can be problematic if the return value isstored in a variable of type 'bool'. If bool is implemented using C99's_Bool, that can lead to comparison failures if the variable is thencompared again with the expression (see ginStepRight() for an examplethat fails), as _Bool forces the result to be 0/1. That happens in someconfigurations of newer MSVC compilers. It's also problematic whenstoring the result of such an expression in a narrower type.Several gin macros have been declared in that style since gin's initialcommit in8a3631f.There's a lot more macros like this, but this is the only one causingregression test failures; and I don't want to commit and backpatch alarger patch with lots of conflicts just before the next set of minorreleases.Discussion: 20150811154237.GD17575@awork2.anarazel.deBackpatch: All supported branches

1 parent29b6123 commitaf4472bCopy full SHA for af4472b

File tree

1 file changed

-8

lines changed

src/include/access
- gin_private.h

1 file changed

-8

lines changed

`‎src/include/access/gin_private.h‎`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -112,22 +112,22 @@ typedef struct GinMetaPageData`
`112`	`112`	`*/`
`113`	`113`	`#defineGinPageGetOpaque(page) ( (GinPageOpaque) PageGetSpecialPointer(page) )`
`114`	`114`
`115`		`-#defineGinPageIsLeaf(page) ( GinPageGetOpaque(page)->flags & GIN_LEAF )`
	`115`	`+#defineGinPageIsLeaf(page) ((GinPageGetOpaque(page)->flags & GIN_LEAF) != 0 )`
`116`	`116`	`#defineGinPageSetLeaf(page) ( GinPageGetOpaque(page)->flags \|= GIN_LEAF )`
`117`	`117`	`#defineGinPageSetNonLeaf(page) ( GinPageGetOpaque(page)->flags &= ~GIN_LEAF )`
`118`		`-#defineGinPageIsData(page) ( GinPageGetOpaque(page)->flags & GIN_DATA )`
	`118`	`+#defineGinPageIsData(page) ((GinPageGetOpaque(page)->flags & GIN_DATA) != 0 )`
`119`	`119`	`#defineGinPageSetData(page) ( GinPageGetOpaque(page)->flags \|= GIN_DATA )`
`120`		`-#defineGinPageIsList(page) ( GinPageGetOpaque(page)->flags & GIN_LIST )`
	`120`	`+#defineGinPageIsList(page) ((GinPageGetOpaque(page)->flags & GIN_LIST) != 0 )`
`121`	`121`	`#defineGinPageSetList(page) ( GinPageGetOpaque(page)->flags \|= GIN_LIST )`
`122`		`-#defineGinPageHasFullRow(page) ( GinPageGetOpaque(page)->flags & GIN_LIST_FULLROW )`
	`122`	`+#defineGinPageHasFullRow(page) ((GinPageGetOpaque(page)->flags & GIN_LIST_FULLROW) != 0 )`
`123`	`123`	`#defineGinPageSetFullRow(page) ( GinPageGetOpaque(page)->flags \|= GIN_LIST_FULLROW )`
`124`		`-#defineGinPageIsCompressed(page) ( GinPageGetOpaque(page)->flags & GIN_COMPRESSED )`
	`124`	`+#defineGinPageIsCompressed(page) ((GinPageGetOpaque(page)->flags & GIN_COMPRESSED) != 0 )`
`125`	`125`	`#defineGinPageSetCompressed(page) ( GinPageGetOpaque(page)->flags \|= GIN_COMPRESSED )`
`126`	`126`
`127`		`-#defineGinPageIsDeleted(page) ( GinPageGetOpaque(page)->flags & GIN_DELETED)`
	`127`	`+#defineGinPageIsDeleted(page) ((GinPageGetOpaque(page)->flags & GIN_DELETED) != 0)`
`128`	`128`	`#defineGinPageSetDeleted(page) ( GinPageGetOpaque(page)->flags \|= GIN_DELETED)`
`129`	`129`	`#defineGinPageSetNonDeleted(page) ( GinPageGetOpaque(page)->flags &= ~GIN_DELETED)`
`130`		`-#defineGinPageIsIncompleteSplit(page) ( GinPageGetOpaque(page)->flags & GIN_INCOMPLETE_SPLIT)`
	`130`	`+#defineGinPageIsIncompleteSplit(page) ((GinPageGetOpaque(page)->flags & GIN_INCOMPLETE_SPLIT) != 0)`
`131`	`131`
`132`	`132`	`#defineGinPageRightMost(page) ( GinPageGetOpaque(page)->rightlink == InvalidBlockNumber)`
`133`	`133`
`@@ -224,7 +224,7 @@ typedef signed char GinNullCategory;`
`224`	`224`	`#defineGinGetPostingOffset(itup)(GinItemPointerGetBlockNumber(&(itup)->t_tid) & (~GIN_ITUP_COMPRESSED))`
`225`	`225`	`#defineGinSetPostingOffset(itup,n) ItemPointerSetBlockNumber(&(itup)->t_tid,(n)\|GIN_ITUP_COMPRESSED)`
`226`	`226`	`#defineGinGetPosting(itup)((Pointer) ((char*)(itup) + GinGetPostingOffset(itup)))`
`227`		`-#defineGinItupIsCompressed(itup)(GinItemPointerGetBlockNumber(&(itup)->t_tid) & GIN_ITUP_COMPRESSED)`
	`227`	`+#defineGinItupIsCompressed(itup)((GinItemPointerGetBlockNumber(&(itup)->t_tid) & GIN_ITUP_COMPRESSED) != 0)`
`228`	`228`
`229`	`229`	`/*`
`230`	`230`	`* Maximum size of an item on entry tree page. Make sure that we fit at least`

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!

Commitaf4472b

File tree

1 file changed

1 file changed

`‎src/include/access/gin_private.h‎`

0 commit comments