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

michaelpq · michaelpq · commit fd0625c7a9c6 · 2021-09-08T09:44:04.000+09:00
All the code paths simplified here were already using a boolean or used an expression that led to zero or one, making the extra bits unnecessary. Author: Justin Pryzby Reviewed-by: Tom Lane, Michael Paquier, Peter Smith Discussion: https://postgr.es/m/20210428182936.GE27406@telsasoft.com
diff --git a/contrib/intarray/_int_tool.c b/contrib/intarray/_int_tool.c
@@ -41,7 +41,7 @@ inner_int_contains(ArrayType *a, ArrayType *b)
 			break;				/* db[j] is not in da */
 	}
 
-	return (n == nb) ? true : false;
+	return (n == nb);
 }
 
 /* arguments are assumed sorted */
diff --git a/contrib/ltree/ltree_gist.c b/contrib/ltree/ltree_gist.c
@@ -137,7 +137,7 @@ ltree_same(PG_FUNCTION_ARGS)
 		PG_RETURN_POINTER(result);
 
 	if (LTG_ISONENODE(a))
-		*result = (ISEQ(LTG_NODE(a), LTG_NODE(b))) ? true : false;
+		*result = ISEQ(LTG_NODE(a), LTG_NODE(b));
 	else
 	{
 		int32		i;
diff --git a/contrib/sepgsql/selinux.c b/contrib/sepgsql/selinux.c
@@ -615,7 +615,7 @@ static int	sepgsql_mode = SEPGSQL_MODE_INTERNAL;
 bool
 sepgsql_is_enabled(void)
 {
-	return (sepgsql_mode != SEPGSQL_MODE_DISABLED ? true : false);
+	return (sepgsql_mode != SEPGSQL_MODE_DISABLED);
 }
 
 /*
diff --git a/src/backend/access/gin/gindatapage.c b/src/backend/access/gin/gindatapage.c
@@ -241,7 +241,7 @@ dataIsMoveRight(GinBtree btree, Page page)
 	if (GinPageIsDeleted(page))
 		return true;
 
-	return (ginCompareItemPointers(&btree->itemptr, iptr) > 0) ? true : false;
+	return (ginCompareItemPointers(&btree->itemptr, iptr) > 0);
 }
 
 /*
diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c
@@ -100,7 +100,7 @@ initGinState(GinState *state, Relation index)
 	MemSet(state, 0, sizeof(GinState));
 
 	state->index = index;
-	state->oneCol = (origTupdesc->natts == 1) ? true : false;
+	state->oneCol = (origTupdesc->natts == 1);
 	state->origTupdesc = origTupdesc;
 
 	for (i = 0; i < origTupdesc->natts; i++)
diff --git a/src/backend/access/gist/gistsplit.c b/src/backend/access/gist/gistsplit.c
@@ -303,9 +303,9 @@ supportSecondarySplit(Relation r, GISTSTATE *giststate, int attno,
 		penalty2 = gistpenalty(giststate, attno, entry1, false, &entrySR, false);
 
 		if (penalty1 < penalty2)
-			leaveOnLeft = (sv->spl_ldatum_exists) ? true : false;
+			leaveOnLeft = sv->spl_ldatum_exists;
 		else
-			leaveOnLeft = (sv->spl_rdatum_exists) ? true : false;
+			leaveOnLeft = sv->spl_rdatum_exists;
 	}
 
 	if (leaveOnLeft == false)
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
@@ -816,7 +816,7 @@ hashbucketcleanup(Relation rel, Bucket cur_bucket, Buffer bucket_buf,
 				XLogRecPtr	recptr;
 
 				xlrec.clear_dead_marking = clear_dead_marking;
-				xlrec.is_primary_bucket_page = (buf == bucket_buf) ? true : false;
+				xlrec.is_primary_bucket_page = (buf == bucket_buf);
 
 				XLogBeginInsert();
 				XLogRegisterData((char *) &xlrec, SizeOfHashDelete);
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
@@ -176,7 +176,7 @@ _hash_doinsert(Relation rel, IndexTuple itup, Relation heapRel)
 			LockBuffer(buf, BUFFER_LOCK_UNLOCK);
 
 			/* chain to a new overflow page */
-			buf = _hash_addovflpage(rel, metabuf, buf, (buf == bucket_buf) ? true : false);
+			buf = _hash_addovflpage(rel, metabuf, buf, (buf == bucket_buf));
 			page = BufferGetPage(buf);
 
 			/* should fit now, given test above */
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
@@ -953,7 +953,7 @@ _hash_squeezebucket(Relation rel,
 						xl_hash_move_page_contents xlrec;
 
 						xlrec.ntups = nitups;
-						xlrec.is_prim_bucket_same_wrt = (wbuf == bucket_buf) ? true : false;
+						xlrec.is_prim_bucket_same_wrt = (wbuf == bucket_buf);
 
 						XLogBeginInsert();
 						XLogRegisterData((char *) &xlrec, SizeOfHashMovePageContents);
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
@@ -1195,7 +1195,7 @@ _hash_splitbucket(Relation rel,
 					all_tups_size = 0;
 
 					/* chain to a new overflow page */
-					nbuf = _hash_addovflpage(rel, metabuf, nbuf, (nbuf == bucket_nbuf) ? true : false);
+					nbuf = _hash_addovflpage(rel, metabuf, nbuf, (nbuf == bucket_nbuf));
 					npage = BufferGetPage(nbuf);
 					nopaque = (HashPageOpaque) PageGetSpecialPointer(npage);
 				}
diff --git a/src/backend/access/heap/heapam_visibility.c b/src/backend/access/heap/heapam_visibility.c
@@ -1475,7 +1475,7 @@ HeapTupleIsSurelyDead(HeapTuple htup, GlobalVisState *vistest)
 	 * all relevant hint bits were just set moments ago).
 	 */
 	if (!HeapTupleHeaderXminCommitted(tuple))
-		return HeapTupleHeaderXminInvalid(tuple) ? true : false;
+		return HeapTupleHeaderXminInvalid(tuple);
 
 	/*
 	 * If the inserting transaction committed, but any deleting transaction
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
@@ -1037,7 +1037,7 @@ SPI_modifytuple(Relation rel, HeapTuple tuple, int natts, int *attnum,
 		if (attnum[i] <= 0 || attnum[i] > numberOfAttributes)
 			break;
 		v[attnum[i] - 1] = Values[i];
-		n[attnum[i] - 1] = (Nulls && Nulls[i] == 'n') ? true : false;
+		n[attnum[i] - 1] = (Nulls && Nulls[i] == 'n');
 	}
 
 	if (i == natts)				/* no errors in *attnum */
diff --git a/src/backend/jit/jit.c b/src/backend/jit/jit.c
@@ -198,7 +198,7 @@ file_exists(const char *name)
 	AssertArg(name != NULL);
 
 	if (stat(name, &st) == 0)
-		return S_ISDIR(st.st_mode) ? false : true;
+		return !S_ISDIR(st.st_mode);
 	else if (!(errno == ENOENT || errno == ENOTDIR))
 		ereport(ERROR,
 				(errcode_for_file_access(),
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
@@ -936,7 +936,7 @@ create_seqscan_path(PlannerInfo *root, RelOptInfo *rel,
 	pathnode->pathtarget = rel->reltarget;
 	pathnode->param_info = get_baserel_parampathinfo(root, rel,
 													 required_outer);
-	pathnode->parallel_aware = parallel_workers > 0 ? true : false;
+	pathnode->parallel_aware = (parallel_workers > 0);
 	pathnode->parallel_safe = rel->consider_parallel;
 	pathnode->parallel_workers = parallel_workers;
 	pathnode->pathkeys = NIL;	/* seqscan has unordered result */
@@ -1057,7 +1057,7 @@ create_bitmap_heap_path(PlannerInfo *root,
 	pathnode->path.pathtarget = rel->reltarget;
 	pathnode->path.param_info = get_baserel_parampathinfo(root, rel,
 														  required_outer);
-	pathnode->path.parallel_aware = parallel_degree > 0 ? true : false;
+	pathnode->path.parallel_aware = (parallel_degree > 0);
 	pathnode->path.parallel_safe = rel->consider_parallel;
 	pathnode->path.parallel_workers = parallel_degree;
 	pathnode->path.pathkeys = NIL;	/* always unordered */
diff --git a/src/backend/statistics/mcv.c b/src/backend/statistics/mcv.c
@@ -1772,7 +1772,7 @@ mcv_get_match_bitmap(PlannerInfo *root, List *clauses,
 			for (i = 0; i < mcvlist->nitems; i++)
 			{
 				int			j;
-				bool		match = (expr->useOr ? false : true);
+				bool		match = !expr->useOr;
 				MCVItem    *item = &mcvlist->items[i];
 
 				/*
diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c
@@ -336,7 +336,7 @@ BufFileOpenFileSet(FileSet *fileset, const char *name, int mode,
 
 	file = makeBufFileCommon(nfiles);
 	file->files = files;
-	file->readOnly = (mode == O_RDONLY) ? true : false;
+	file->readOnly = (mode == O_RDONLY);
 	file->fileset = fileset;
 	file->name = pstrdup(name);
 
diff --git a/src/backend/tsearch/ts_parse.c b/src/backend/tsearch/ts_parse.c
@@ -288,7 +288,7 @@ LexizeExec(LexizeData *ld, ParsedLex **correspondLexem)
 				}
 			}
 
-			ld->dictState.isend = (curVal->type == 0) ? true : false;
+			ld->dictState.isend = (curVal->type == 0);
 			ld->dictState.getnext = false;
 
 			res = (TSLexeme *) DatumGetPointer(FunctionCall4(&(dict->lexize),
diff --git a/src/backend/utils/adt/bool.c b/src/backend/utils/adt/bool.c
@@ -184,7 +184,7 @@ boolrecv(PG_FUNCTION_ARGS)
 	int			ext;
 
 	ext = pq_getmsgbyte(buf);
-	PG_RETURN_BOOL((ext != 0) ? true : false);
+	PG_RETURN_BOOL(ext != 0);
 }
 
 /*
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
@@ -8005,14 +8005,14 @@ isSimpleNode(Node *node, Node *parentNode, int prettyFlags)
 			 * appears simple since . has top precedence, unless parent is
 			 * T_FieldSelect itself!
 			 */
-			return (IsA(parentNode, FieldSelect) ? false : true);
+			return !IsA(parentNode, FieldSelect);
 
 		case T_FieldStore:
 
 			/*
 			 * treat like FieldSelect (probably doesn't matter)
 			 */
-			return (IsA(parentNode, FieldStore) ? false : true);
+			return !IsA(parentNode, FieldStore);
 
 		case T_CoerceToDomain:
 			/* maybe simple, check args */
diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c
@@ -109,7 +109,7 @@ gtsquery_same(PG_FUNCTION_ARGS)
 	TSQuerySign b = PG_GETARG_TSQUERYSIGN(1);
 	bool	   *result = (bool *) PG_GETARG_POINTER(2);
 
-	*result = (a == b) ? true : false;
+	*result = (a == b);
 
 	PG_RETURN_POINTER(result);
 }
diff --git a/src/backend/utils/adt/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c
@@ -186,7 +186,7 @@ QTNEq(QTNode *a, QTNode *b)
 	if (!(sign == a->sign && sign == b->sign))
 		return false;
 
-	return (QTNodeCompare(a, b) == 0) ? true : false;
+	return (QTNodeCompare(a, b) == 0);
 }
 
 /*
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
@@ -458,7 +458,7 @@ file_exists(const char *name)
 	AssertArg(name != NULL);
 
 	if (stat(name, &st) == 0)
-		return S_ISDIR(st.st_mode) ? false : true;
+		return !S_ISDIR(st.st_mode);
 	else if (!(errno == ENOENT || errno == ENOTDIR || errno == EACCES))
 		ereport(ERROR,
 				(errcode_for_file_access(),

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 */`
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`	`int32 i;`
Original file line number	Diff line number	Diff line change
`@@ -615,7 +615,7 @@ static int sepgsql_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`	`/*`
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`	`/*`
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`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1037,7 +1037,7 @@ SPI_modifytuple(Relation rel, HeapTuple tuple, int natts, int *attnum,`
`1037`	`1037`	`if (attnum[i] <= 0 \|\| attnum[i] > numberOfAttributes)`
`1038`	`1038`	`break;`
`1039`	`1039`	`v[attnum[i] - 1] = Values[i];`
`1040`		`- n[attnum[i] - 1] = (Nulls && Nulls[i] == 'n') ? true : false;`
	`1040`	`+ n[attnum[i] - 1] = (Nulls && Nulls[i] == 'n');`
`1041`	`1041`	`}`
`1042`	`1042`
`1043`	`1043`	`if (i == natts) /* no errors in attnum /`
Original file line number	Diff line number	Diff line change
`@@ -1772,7 +1772,7 @@ mcv_get_match_bitmap(PlannerInfo root, List clauses,`
`1772`	`1772`	`for (i = 0; i < mcvlist->nitems; i++)`
`1773`	`1773`	`{`
`1774`	`1774`	`int j;`
`1775`		`- bool match = (expr->useOr ? false : true);`
	`1775`	`+ bool match = !expr->useOr;`
`1776`	`1776`	`MCVItem *item = &mcvlist->items[i];`
`1777`	`1777`
`1778`	`1778`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ LexizeExec(LexizeData ld, ParsedLex *correspondLexem)`
`288`	`288`	`}`
`289`	`289`	`}`
`290`	`290`
`291`		`- ld->dictState.isend = (curVal->type == 0) ? true : false;`
	`291`	`+ ld->dictState.isend = (curVal->type == 0);`
`292`	`292`	`ld->dictState.getnext = false;`
`293`	`293`
`294`	`294`	`res = (TSLexeme *) DatumGetPointer(FunctionCall4(&(dict->lexize),`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ boolrecv(PG_FUNCTION_ARGS)`
`184`	`184`	`int ext;`
`185`	`185`
`186`	`186`	`ext = pq_getmsgbyte(buf);`
`187`		`- PG_RETURN_BOOL((ext != 0) ? true : false);`
	`187`	`+ PG_RETURN_BOOL(ext != 0);`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ gtsquery_same(PG_FUNCTION_ARGS)`
`109`	`109`	`TSQuerySign b = PG_GETARG_TSQUERYSIGN(1);`
`110`	`110`	`bool result = (bool ) PG_GETARG_POINTER(2);`
`111`	`111`
`112`		`- *result = (a == b) ? true : false;`
	`112`	`+ *result = (a == b);`
`113`	`113`
`114`	`114`	`PG_RETURN_POINTER(result);`
`115`	`115`	`}`