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

michaelpq · michaelpq · commit 68f7c4b57a27 · 2021-10-11T09:36:42.000+09:00
This is similar to fd0625c, taking care of any remaining code paths that are worth the cleanup. This also changes some cases using opposite expression patterns. Author: Justin Pryzby, Masahiko Sawada Discussion: https://postgr.es/m/CAD21AoCdF8dnUvr-BUWWGvA_XhKSoANacBMZb6jKyCk4TYfQ2Q@mail.gmail.com
diff --git a/contrib/ltree/ltree_op.c b/contrib/ltree/ltree_op.c
@@ -91,42 +91,42 @@ Datum
 ltree_lt(PG_FUNCTION_ARGS)
 {
 	RUNCMP;
-	PG_RETURN_BOOL((res < 0) ? true : false);
+	PG_RETURN_BOOL(res < 0);
 }
 
 Datum
 ltree_le(PG_FUNCTION_ARGS)
 {
 	RUNCMP;
-	PG_RETURN_BOOL((res <= 0) ? true : false);
+	PG_RETURN_BOOL(res <= 0);
 }
 
 Datum
 ltree_eq(PG_FUNCTION_ARGS)
 {
 	RUNCMP;
-	PG_RETURN_BOOL((res == 0) ? true : false);
+	PG_RETURN_BOOL(res == 0);
 }
 
 Datum
 ltree_ge(PG_FUNCTION_ARGS)
 {
 	RUNCMP;
-	PG_RETURN_BOOL((res >= 0) ? true : false);
+	PG_RETURN_BOOL(res >= 0);
 }
 
 Datum
 ltree_gt(PG_FUNCTION_ARGS)
 {
 	RUNCMP;
-	PG_RETURN_BOOL((res > 0) ? true : false);
+	PG_RETURN_BOOL(res > 0);
 }
 
 Datum
 ltree_ne(PG_FUNCTION_ARGS)
 {
 	RUNCMP;
-	PG_RETURN_BOOL((res != 0) ? true : false);
+	PG_RETURN_BOOL(res != 0);
 }
 
 Datum
diff --git a/src/backend/access/gist/gistsplit.c b/src/backend/access/gist/gistsplit.c
@@ -421,8 +421,8 @@ gistUserPicksplit(Relation r, GistEntryVector *entryvec, int attno, GistSplitVec
 	 * Prepare spl_ldatum/spl_rdatum/spl_ldatum_exists/spl_rdatum_exists in
 	 * case we are doing a secondary split (see comments in gist.h).
 	 */
-	sv->spl_ldatum_exists = (v->spl_lisnull[attno]) ? false : true;
-	sv->spl_rdatum_exists = (v->spl_risnull[attno]) ? false : true;
+	sv->spl_ldatum_exists = !(v->spl_lisnull[attno]);
+	sv->spl_rdatum_exists = !(v->spl_risnull[attno]);
 	sv->spl_ldatum = v->spl_lattr[attno];
 	sv->spl_rdatum = v->spl_rattr[attno];
 
@@ -451,8 +451,8 @@ gistUserPicksplit(Relation r, GistEntryVector *entryvec, int attno, GistSplitVec
 		 * Reinit GIST_SPLITVEC. Although these fields are not used by
 		 * genericPickSplit(), set them up for further processing
 		 */
-		sv->spl_ldatum_exists = (v->spl_lisnull[attno]) ? false : true;
-		sv->spl_rdatum_exists = (v->spl_risnull[attno]) ? false : true;
+		sv->spl_ldatum_exists = !(v->spl_lisnull[attno]);
+		sv->spl_rdatum_exists = !(v->spl_risnull[attno]);
 		sv->spl_ldatum = v->spl_lattr[attno];
 		sv->spl_rdatum = v->spl_rattr[attno];
 
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -7463,7 +7463,7 @@ ATExecColumnDefault(Relation rel, const char *colName,
 	 * operation when the user asked for a drop.
 	 */
 	RemoveAttrDefault(RelationGetRelid(rel), attnum, DROP_RESTRICT, false,
-					  newDefault == NULL ? false : true);
+					  newDefault != NULL);
 
 	if (newDefault)
 	{
diff --git a/src/backend/executor/nodeResult.c b/src/backend/executor/nodeResult.c
@@ -195,7 +195,7 @@ ExecInitResult(Result *node, EState *estate, int eflags)
 	resstate->ps.ExecProcNode = ExecResult;
 
 	resstate->rs_done = false;
-	resstate->rs_checkqual = (node->resconstantqual == NULL) ? false : true;
+	resstate->rs_checkqual = (node->resconstantqual != NULL);
 
 	/*
 	 * Miscellaneous initialization
@@ -260,7 +260,7 @@ void
 ExecReScanResult(ResultState *node)
 {
 	node->rs_done = false;
-	node->rs_checkqual = (node->resconstantqual == NULL) ? false : true;
+	node->rs_checkqual = (node->resconstantqual != NULL);
 
 	/*
 	 * If chgParam of subnode is not null then plan will be re-scanned by
diff --git a/src/backend/statistics/mcv.c b/src/backend/statistics/mcv.c
@@ -1619,8 +1619,7 @@ mcv_get_match_bitmap(PlannerInfo *root, List *clauses,
 	Assert(mcvlist->nitems <= STATS_MCVLIST_MAX_ITEMS);
 
 	matches = palloc(sizeof(bool) * mcvlist->nitems);
-	memset(matches, (is_or) ? false : true,
-		   sizeof(bool) * mcvlist->nitems);
+	memset(matches, !is_or,  sizeof(bool) * mcvlist->nitems);
 
 	/*
 	 * Loop through the list of clauses, and for each of them evaluate all the
diff --git a/src/backend/tsearch/ts_utils.c b/src/backend/tsearch/ts_utils.c
@@ -142,5 +142,5 @@ searchstoplist(StopList *s, char *key)
 {
 	return (s->stop && s->len > 0 &&
 			bsearch(&key, s->stop, s->len,
-					sizeof(char *), pg_qsort_strcmp)) ? true : false;
+					sizeof(char *), pg_qsort_strcmp));
 }
diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c
@@ -1856,7 +1856,7 @@ TParserGet(TParser *prs)
 		}
 	}
 
-	return (item && (item->flags & A_BINGO)) ? true : false;
+	return (item && (item->flags & A_BINGO));
 }
 
 Datum

Original file line number	Diff line number	Diff line change
`@@ -91,42 +91,42 @@ Datum`
`91`	`91`	`ltree_lt(PG_FUNCTION_ARGS)`
`92`	`92`	`{`
`93`	`93`	`RUNCMP;`
`94`		`- PG_RETURN_BOOL((res < 0) ? true : false);`
	`94`	`+ PG_RETURN_BOOL(res < 0);`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`Datum`
`98`	`98`	`ltree_le(PG_FUNCTION_ARGS)`
`99`	`99`	`{`
`100`	`100`	`RUNCMP;`
`101`		`- PG_RETURN_BOOL((res <= 0) ? true : false);`
	`101`	`+ PG_RETURN_BOOL(res <= 0);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`Datum`
`105`	`105`	`ltree_eq(PG_FUNCTION_ARGS)`
`106`	`106`	`{`
`107`	`107`	`RUNCMP;`
`108`		`- PG_RETURN_BOOL((res == 0) ? true : false);`
	`108`	`+ PG_RETURN_BOOL(res == 0);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`Datum`
`112`	`112`	`ltree_ge(PG_FUNCTION_ARGS)`
`113`	`113`	`{`
`114`	`114`	`RUNCMP;`
`115`		`- PG_RETURN_BOOL((res >= 0) ? true : false);`
	`115`	`+ PG_RETURN_BOOL(res >= 0);`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`Datum`
`119`	`119`	`ltree_gt(PG_FUNCTION_ARGS)`
`120`	`120`	`{`
`121`	`121`	`RUNCMP;`
`122`		`- PG_RETURN_BOOL((res > 0) ? true : false);`
	`122`	`+ PG_RETURN_BOOL(res > 0);`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`Datum`
`126`	`126`	`ltree_ne(PG_FUNCTION_ARGS)`
`127`	`127`	`{`
`128`	`128`	`RUNCMP;`
`129`		`- PG_RETURN_BOOL((res != 0) ? true : false);`
	`129`	`+ PG_RETURN_BOOL(res != 0);`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`Datum`
Original file line number	Diff line number	Diff line change
`@@ -7463,7 +7463,7 @@ ATExecColumnDefault(Relation rel, const char *colName,`
`7463`	`7463`	`* operation when the user asked for a drop.`
`7464`	`7464`	`*/`
`7465`	`7465`	`RemoveAttrDefault(RelationGetRelid(rel), attnum, DROP_RESTRICT, false,`
`7466`		`- newDefault == NULL ? false : true);`
	`7466`	`+ newDefault != NULL);`
`7467`	`7467`
`7468`	`7468`	`if (newDefault)`
`7469`	`7469`	`{`
Original file line number	Diff line number	Diff line change
`@@ -142,5 +142,5 @@ searchstoplist(StopList s, char key)`
`142`	`142`	`{`
`143`	`143`	`return (s->stop && s->len > 0 &&`
`144`	`144`	`bsearch(&key, s->stop, s->len,`
`145`		`- sizeof(char *), pg_qsort_strcmp)) ? true : false;`
	`145`	`+ sizeof(char *), pg_qsort_strcmp));`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1856,7 +1856,7 @@ TParserGet(TParser *prs)`
`1856`	`1856`	`}`
`1857`	`1857`	`}`
`1858`	`1858`
`1859`		`- return (item && (item->flags & A_BINGO)) ? true : false;`
	`1859`	`+ return (item && (item->flags & A_BINGO));`
`1860`	`1860`	`}`
`1861`	`1861`
`1862`	`1862`	`Datum`