From 1ab707c1d13bd19e8748f67846ee78fab8e93a9e Mon Sep 17 00:00:00 2001 From: Tomas Vondra Date: Wed, 15 Feb 2023 12:53:47 +0100 Subject: [PATCH 2/9] BRIN minmax-multi cleanup When assigning to a Datum variable, use BoolGetDatum() consistently. Simnplify the code by using PG_RETURN_BOOL(). --- src/backend/access/brin/brin_minmax_multi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/backend/access/brin/brin_minmax_multi.c b/src/backend/access/brin/brin_minmax_multi.c index 8e4e6c2fc8a..1d665383b2c 100644 --- a/src/backend/access/brin/brin_minmax_multi.c +++ b/src/backend/access/brin/brin_minmax_multi.c @@ -2627,7 +2627,7 @@ brin_minmax_multi_consistent(PG_FUNCTION_ARGS) FmgrInfo *cmpFn; /* by default this range does not match */ - matches = false; + matches = BoolGetDatum(false); /* * Otherwise, need to compare the new value with @@ -2655,7 +2655,7 @@ brin_minmax_multi_consistent(PG_FUNCTION_ARGS) * We haven't managed to eliminate this range, so * consider it matching. */ - matches = true; + matches = BoolGetDatum(true); break; } @@ -2670,7 +2670,7 @@ brin_minmax_multi_consistent(PG_FUNCTION_ARGS) default: /* shouldn't happen */ elog(ERROR, "invalid strategy number %d", key->sk_strategy); - matches = 0; + matches = BoolGetDatum(false); break; } @@ -2686,7 +2686,7 @@ brin_minmax_multi_consistent(PG_FUNCTION_ARGS) * have we found a range matching all scan keys? if yes, we're done */ if (matching) - PG_RETURN_DATUM(BoolGetDatum(true)); + PG_RETURN_BOOL(true); } /* @@ -2729,7 +2729,7 @@ brin_minmax_multi_consistent(PG_FUNCTION_ARGS) default: /* shouldn't happen */ elog(ERROR, "invalid strategy number %d", key->sk_strategy); - matches = 0; + matches = BoolGetDatum(false); break; } @@ -2743,10 +2743,10 @@ brin_minmax_multi_consistent(PG_FUNCTION_ARGS) /* have we found a range matching all scan keys? if yes, we're done */ if (matching) - PG_RETURN_DATUM(BoolGetDatum(true)); + PG_RETURN_BOOL(true); } - PG_RETURN_DATUM(BoolGetDatum(false)); + PG_RETURN_BOOL(false); } /* -- 2.40.1