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

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[email protected]

diff --git a/contrib/intarray/_int_tool.c b/contrib/intarray/_int_tool.c
index 91690aff51f779fee4143780ecf99d56f7194c0a..8ed4d63fc3c13b28a107091b0d6685b44e323f98 100644 (file)
--- 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
index 6cf181bc53038a9238b8ae29ca006094426ce2fd..7c39ed4298e8204df4dd0b82794134d125f8d4da 100644 (file)
--- 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
index f11968bcaa2943a2898e2c0402f27559487da5c5..6264d7273caf30df026e9bc2d781835c94b7251d 100644 (file)
--- 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
index 06c05865435f063b8f93a170e68040c7b678df4e..fbccf3d038d72dff9b31ab022f37286f5334fa0a 100644 (file)
--- 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
index cdd626ff0a444c5130302ff7d03c093777a8a07e..6d2d71be32b0cbcd405cc9afcd101c327d4be8e0 100644 (file)
--- 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
index 526ed1218e60f51119d35fe4b040cab613639c66..853ebc387b4a0207dd88cfee5156cbb56684df9d 100644 (file)
--- 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
index 0752fb38a9248d76f6f02844e5fbe463f7af7f08..eb3810494f2f9a42d35be4ae27e9e9f49bee8b89 100644 (file)
--- 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
index d254a00b6ac37acae98ead2c0769f63ddec1e407..fe9f0df20b1101b88734d64b3b7fd2d3a43247d1 100644 (file)
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -176,7 +176,7 @@ restart_insert:
                        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
index 404f2b6221224be8c56f722c1bf2713a67dec1ec..b312af57e11d32ad97c169c32b66d531db9ef333 100644 (file)
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -953,7 +953,7 @@ readpage:
                                                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
index b73002535669df6fd8c0f0424c2c5d92ed4d77a5..159646c7c3e9f8a4e0e6b430466fdf5c874b0471 100644 (file)
--- 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
index d3c57cd16a836c6ec87278aaec79b9b92cc7c99b..b72b03ea25ab12f47657745899b93bbd01b03a76 100644 (file)
--- 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
index a8d7fe6dabfcb1f5b24558d791533b9691683adb..a5aec7ba7dbad25e56368e073ddfa7a377b1b52a 100644 (file)
--- 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
index 2da300e000d4864a0cd6284ea12d902aacad08dd..91b8ae6c51af5319b9cfcce0752a431ddac631c5 100644 (file)
--- 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
index a53850b3702145dbf0fbba52c9953413104202ae..cedb3848dde95b63f6648ee53e405ae14cb8b29a 100644 (file)
--- 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
index ef118952c74e95770c9c24fdd5cd5f3f97496f0f..35b39ece0754e2db12d06c2a6f82bf4b3d65a749 100644 (file)
--- 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
index ff3aa67cde0aa8016690f45bf8d73c439fca7eb6..b673150dbeef6215da36776d249287879b7e60a6 100644 (file)
--- 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
index d978c8850de9889115fcef66a28acb31309964a5..3ae0044dfb8b69fc1cd47238b6dd20a15c1fecb1 100644 (file)
--- 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
index fe11d1ae94639b47e51fe90807f058d1ef847ef9..cd98f84270a1499437dd5500c47f158506cd78d7 100644 (file)
--- 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
index 8ff4e5dc07b3b6ef1da7bb3a450ab7adc683cb03..1fb0b7b098419a87bbf658953e41dce621593af0 100644 (file)
--- 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
index 14d7343afa7c6979e8522e57418e75e32f3292c4..906a686914e20c607d53910b9bc315026af10ad2 100644 (file)
--- 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
index 7f936427b5fd6be79179630fd9ddd90154f3a387..b3dd4f4be02ea58bed7e7ae0ad14460b80050cf7 100644 (file)
--- 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
index e8c6cdde9728b65abb30277d8b5ef4f303e54e53..96fd9d2268582773f1b8cdcefe9897ff174c657d 100644 (file)
--- 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(),