Movatterモバイル変換

Skip to content

postgrespro/postgresPublic

forked frompostgres/postgres

NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitfd0625c

michaelpq

committed

Clean up some code using "(expr) ? true : false"

All the code paths simplified here were already using a boolean or usedan expression that led to zero or one, making the extra bitsunnecessary.Author: Justin PryzbyReviewed-by: Tom Lane, Michael Paquier, Peter SmithDiscussion:https://postgr.es/m/20210428182936.GE27406@telsasoft.com

1 parentd6c916f commitfd0625cCopy full SHA for fd0625c

File tree

22 files changed

+25

-25

lines changed

contrib
- intarray
  - _int_tool.c
- ltree
  - ltree_gist.c
- sepgsql
  - selinux.c
src/backend
- access
  - gin
    - gindatapage.c
    - ginutil.c
  - gist
    - gistsplit.c
  - hash
  - heap
    - heapam_visibility.c
- executor
  - spi.c
- jit
  - jit.c
- optimizer/util
  - pathnode.c
- statistics
  - mcv.c
- storage/file
  - buffile.c
- tsearch
  - ts_parse.c
- utils
  - adt
  - fmgr
    - dfmgr.c

22 files changed

+25

-25

lines changed

`‎contrib/intarray/_int_tool.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ inner_int_contains(ArrayType a, ArrayType b)`
`41`	`41`	`break;/* db[j] is not in da */`
`42`	`42`	`}`
`43`	`43`
`44`		`-return (n==nb) ? true : false;`
	`44`	`+return (n==nb);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`/* arguments are assumed sorted */`

`‎contrib/ltree/ltree_gist.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ ltree_same(PG_FUNCTION_ARGS)`
`137`	`137`	`PG_RETURN_POINTER(result);`
`138`	`138`
`139`	`139`	`if (LTG_ISONENODE(a))`
`140`		`-*result=(ISEQ(LTG_NODE(a),LTG_NODE(b))) ? true : false;`
	`140`	`+*result=ISEQ(LTG_NODE(a),LTG_NODE(b));`
`141`	`141`	`else`
`142`	`142`	`{`
`143`	`143`	`int32i;`

`‎contrib/sepgsql/selinux.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -615,7 +615,7 @@ static intsepgsql_mode = SEPGSQL_MODE_INTERNAL;`
`615`	`615`	`bool`
`616`	`616`	`sepgsql_is_enabled(void)`
`617`	`617`	`{`
`618`		`-return (sepgsql_mode!=SEPGSQL_MODE_DISABLED ? true : false);`
	`618`	`+return (sepgsql_mode!=SEPGSQL_MODE_DISABLED);`
`619`	`619`	`}`
`620`	`620`
`621`	`621`	`/*`

`‎src/backend/access/gin/gindatapage.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ dataIsMoveRight(GinBtree btree, Page page)`
`241`	`241`	`if (GinPageIsDeleted(page))`
`242`	`242`	`return true;`
`243`	`243`
`244`		`-return (ginCompareItemPointers(&btree->itemptr,iptr)>0) ? true : false;`
	`244`	`+return (ginCompareItemPointers(&btree->itemptr,iptr)>0);`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`/*`

`‎src/backend/access/gin/ginutil.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ initGinState(GinState *state, Relation index)`
`100`	`100`	`MemSet(state,0,sizeof(GinState));`
`101`	`101`
`102`	`102`	`state->index=index;`
`103`		`-state->oneCol= (origTupdesc->natts==1) ? true : false;`
	`103`	`+state->oneCol= (origTupdesc->natts==1);`
`104`	`104`	`state->origTupdesc=origTupdesc;`
`105`	`105`
`106`	`106`	`for (i=0;i<origTupdesc->natts;i++)`

`‎src/backend/access/gist/gistsplit.c‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -303,9 +303,9 @@ supportSecondarySplit(Relation r, GISTSTATE *giststate, int attno,`
`303`	`303`	`penalty2=gistpenalty(giststate,attno,entry1, false,&entrySR, false);`
`304`	`304`
`305`	`305`	`if (penalty1<penalty2)`
`306`		`-leaveOnLeft=(sv->spl_ldatum_exists) ? true : false;`
	`306`	`+leaveOnLeft=sv->spl_ldatum_exists;`
`307`	`307`	`else`
`308`		`-leaveOnLeft=(sv->spl_rdatum_exists) ? true : false;`
	`308`	`+leaveOnLeft=sv->spl_rdatum_exists;`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`if (leaveOnLeft== false)`

`‎src/backend/access/hash/hash.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -816,7 +816,7 @@ hashbucketcleanup(Relation rel, Bucket cur_bucket, Buffer bucket_buf,`
`816`	`816`	`XLogRecPtrrecptr;`
`817`	`817`
`818`	`818`	`xlrec.clear_dead_marking=clear_dead_marking;`
`819`		`-xlrec.is_primary_bucket_page= (buf==bucket_buf) ? true : false;`
	`819`	`+xlrec.is_primary_bucket_page= (buf==bucket_buf);`
`820`	`820`
`821`	`821`	`XLogBeginInsert();`
`822`	`822`	`XLogRegisterData((char*)&xlrec,SizeOfHashDelete);`

`‎src/backend/access/hash/hashinsert.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ _hash_doinsert(Relation rel, IndexTuple itup, Relation heapRel)`
`176`	`176`	`LockBuffer(buf,BUFFER_LOCK_UNLOCK);`
`177`	`177`
`178`	`178`	`/* chain to a new overflow page */`
`179`		`-buf=_hash_addovflpage(rel,metabuf,buf, (buf==bucket_buf) ? true : false);`
	`179`	`+buf=_hash_addovflpage(rel,metabuf,buf, (buf==bucket_buf));`
`180`	`180`	`page=BufferGetPage(buf);`
`181`	`181`
`182`	`182`	`/* should fit now, given test above */`

`‎src/backend/access/hash/hashovfl.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -953,7 +953,7 @@ _hash_squeezebucket(Relation rel,`
`953`	`953`	`xl_hash_move_page_contentsxlrec;`
`954`	`954`
`955`	`955`	`xlrec.ntups=nitups;`
`956`		`-xlrec.is_prim_bucket_same_wrt= (wbuf==bucket_buf) ? true : false;`
	`956`	`+xlrec.is_prim_bucket_same_wrt= (wbuf==bucket_buf);`
`957`	`957`
`958`	`958`	`XLogBeginInsert();`
`959`	`959`	`XLogRegisterData((char*)&xlrec,SizeOfHashMovePageContents);`

`‎src/backend/access/hash/hashpage.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1195,7 +1195,7 @@ _hash_splitbucket(Relation rel,`
`1195`	`1195`	`all_tups_size=0;`
`1196`	`1196`
`1197`	`1197`	`/* chain to a new overflow page */`
`1198`		`-nbuf=_hash_addovflpage(rel,metabuf,nbuf, (nbuf==bucket_nbuf) ? true : false);`
	`1198`	`+nbuf=_hash_addovflpage(rel,metabuf,nbuf, (nbuf==bucket_nbuf));`
`1199`	`1199`	`npage=BufferGetPage(nbuf);`
`1200`	`1200`	`nopaque= (HashPageOpaque)PageGetSpecialPointer(npage);`
`1201`	`1201`	`}`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp