From 56ef2f9a32efbb3e35721bbba1ea685f0b1435ce Mon Sep 17 00:00:00 2001 From: Aleksander Alekseev Date: Tue, 3 Feb 2026 16:45:10 +0300 Subject: [PATCH v5 2/2] Avoid unnecessary type casting when using hash_any() hash_any() is merely a wrapper for hash_bytes(). Call it directly when possible in order to avoid unnecessary type casting. Additionally, improve the comment for addHyperLogLog().Previously the comment suggested to use hash_any() which return value is Datum. Since the argument of addHyperLogLog() is uint32, recommending hash_bytes() is more appropriate. Author: Aleksander Alekseev Suggested-by: John Naylor Reviewed-by: John Naylor Discussion: https://postgr.es/m/CAJ7c6TMPhDRQMmkUHPv8oOK97B1mR8NRS61DgjpdaZUPAwaeZQ%40mail.gmail.com --- contrib/ltree/ltree_op.c | 2 +- src/backend/access/tablesample/bernoulli.c | 4 ++-- src/backend/access/tablesample/system.c | 4 ++-- src/backend/commands/async.c | 8 ++++---- src/backend/lib/hyperloglog.c | 2 +- src/backend/nodes/bitmapset.c | 4 ++-- src/backend/tsearch/ts_typanalyze.c | 4 ++-- src/backend/utils/adt/bytea.c | 4 ++-- src/backend/utils/adt/jsonb_gin.c | 2 +- src/backend/utils/adt/jsonb_util.c | 4 ++-- src/backend/utils/adt/varlena.c | 4 ++-- src/backend/utils/cache/funccache.c | 8 ++++---- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/contrib/ltree/ltree_op.c b/contrib/ltree/ltree_op.c index c1fc77fc804..a9a1bce0861 100644 --- a/contrib/ltree/ltree_op.c +++ b/contrib/ltree/ltree_op.c @@ -144,7 +144,7 @@ hash_ltree(PG_FUNCTION_ARGS) while (an > 0) { - uint32 levelHash = DatumGetUInt32(hash_any((unsigned char *) al->name, al->len)); + uint32 levelHash = hash_bytes((unsigned char *) al->name, al->len); /* * Combine hash values of successive elements by multiplying the diff --git a/src/backend/access/tablesample/bernoulli.c b/src/backend/access/tablesample/bernoulli.c index 7d8560464c8..f768d40143e 100644 --- a/src/backend/access/tablesample/bernoulli.c +++ b/src/backend/access/tablesample/bernoulli.c @@ -214,8 +214,8 @@ bernoulli_nextsampletuple(SampleScanState *node, hashinput[1] = tupoffset; - hash = DatumGetUInt32(hash_any((const unsigned char *) hashinput, - (int) sizeof(hashinput))); + hash = hash_bytes((const unsigned char *) hashinput, + (int) sizeof(hashinput)); if (hash < sampler->cutoff) break; } diff --git a/src/backend/access/tablesample/system.c b/src/backend/access/tablesample/system.c index a2b9ba8eea9..de13dd8cab9 100644 --- a/src/backend/access/tablesample/system.c +++ b/src/backend/access/tablesample/system.c @@ -202,8 +202,8 @@ system_nextsampleblock(SampleScanState *node, BlockNumber nblocks) hashinput[0] = nextblock; - hash = DatumGetUInt32(hash_any((const unsigned char *) hashinput, - (int) sizeof(hashinput))); + hash = hash_bytes((const unsigned char *) hashinput, + (int) sizeof(hashinput)); if (hash < sampler->cutoff) break; } diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c index 4cb4b350ce3..44a0cb0155b 100644 --- a/src/backend/commands/async.c +++ b/src/backend/commands/async.c @@ -675,8 +675,8 @@ globalChannelTableHash(const void *key, size_t size, void *arg) dshash_hash h; h = murmurhash32(k->dboid); - h ^= hash_any((const unsigned char *) k->channel, - strnlen(k->channel, NAMEDATALEN)); + h ^= hash_bytes((const unsigned char *) k->channel, + strnlen(k->channel, NAMEDATALEN)); return h; } @@ -3249,8 +3249,8 @@ notification_hash(const void *key, Size keysize) Assert(keysize == sizeof(Notification *)); /* We don't bother to include the payload's trailing null in the hash */ - return DatumGetUInt32(hash_any((const unsigned char *) k->data, - k->channel_len + k->payload_len + 1)); + return hash_bytes((const unsigned char *) k->data, + k->channel_len + k->payload_len + 1); } /* diff --git a/src/backend/lib/hyperloglog.c b/src/backend/lib/hyperloglog.c index c74f11217ef..2b82ff12b2e 100644 --- a/src/backend/lib/hyperloglog.c +++ b/src/backend/lib/hyperloglog.c @@ -158,7 +158,7 @@ freeHyperLogLog(hyperLogLogState *cState) * Adds element to the estimator, from caller-supplied hash. * * It is critical that the hash value passed be an actual hash value, typically - * generated using hash_any(). The algorithm relies on a specific bit-pattern + * generated using hash_bytes(). The algorithm relies on a specific bit-pattern * observable in conjunction with stochastic averaging. There must be a * uniform distribution of bits in hash values for each distinct original value * observed. diff --git a/src/backend/nodes/bitmapset.c b/src/backend/nodes/bitmapset.c index f053d8c4d64..7abe92dc283 100644 --- a/src/backend/nodes/bitmapset.c +++ b/src/backend/nodes/bitmapset.c @@ -1411,8 +1411,8 @@ bms_hash_value(const Bitmapset *a) if (a == NULL) return 0; /* All empty sets hash to 0 */ - return DatumGetUInt32(hash_any((const unsigned char *) a->words, - a->nwords * sizeof(bitmapword))); + return hash_bytes((const unsigned char *) a->words, + a->nwords * sizeof(bitmapword)); } /* diff --git a/src/backend/tsearch/ts_typanalyze.c b/src/backend/tsearch/ts_typanalyze.c index 48ee050e37f..6ca8ead3988 100644 --- a/src/backend/tsearch/ts_typanalyze.c +++ b/src/backend/tsearch/ts_typanalyze.c @@ -496,8 +496,8 @@ lexeme_hash(const void *key, Size keysize) { const LexemeHashKey *l = (const LexemeHashKey *) key; - return DatumGetUInt32(hash_any((const unsigned char *) l->lexeme, - l->length)); + return hash_bytes((const unsigned char *) l->lexeme, + l->length); } /* diff --git a/src/backend/utils/adt/bytea.c b/src/backend/utils/adt/bytea.c index 2e416a83f53..01a76807b94 100644 --- a/src/backend/utils/adt/bytea.c +++ b/src/backend/utils/adt/bytea.c @@ -1107,8 +1107,8 @@ bytea_abbrev_convert(Datum original, SortSupport ssup) * in order to compensate for cases where differences are past * PG_CACHE_LINE_SIZE bytes, so as to limit the overhead of hashing. */ - hash = DatumGetUInt32(hash_any((unsigned char *) authoritative_data, - Min(len, PG_CACHE_LINE_SIZE))); + hash = hash_bytes((unsigned char *) authoritative_data, + Min(len, PG_CACHE_LINE_SIZE)); if (len > PG_CACHE_LINE_SIZE) hash ^= murmurhash32((uint32) len); diff --git a/src/backend/utils/adt/jsonb_gin.c b/src/backend/utils/adt/jsonb_gin.c index d72a6441c5e..f5dbd5589d3 100644 --- a/src/backend/utils/adt/jsonb_gin.c +++ b/src/backend/utils/adt/jsonb_gin.c @@ -1333,7 +1333,7 @@ make_text_key(char flag, const char *str, int len) { uint32 hashval; - hashval = DatumGetUInt32(hash_any((const unsigned char *) str, len)); + hashval = hash_bytes((const unsigned char *) str, len); snprintf(hashbuf, sizeof(hashbuf), "%08x", hashval); str = hashbuf; len = 8; diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c index 91fb9ea09bf..91bff9fda3a 100644 --- a/src/backend/utils/adt/jsonb_util.c +++ b/src/backend/utils/adt/jsonb_util.c @@ -1451,8 +1451,8 @@ JsonbHashScalarValue(const JsonbValue *scalarVal, uint32 *hash) tmp = 0x01; break; case jbvString: - tmp = DatumGetUInt32(hash_any((const unsigned char *) scalarVal->val.string.val, - scalarVal->val.string.len)); + tmp = hash_bytes((const unsigned char *) scalarVal->val.string.val, + scalarVal->val.string.len); break; case jbvNumeric: /* Must hash equal numerics to equal hash codes */ diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index 9832739c846..317a1bf7b88 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -2153,8 +2153,8 @@ varstr_abbrev_convert(Datum original, SortSupport ssup) * in order to compensate for cases where differences are past * PG_CACHE_LINE_SIZE bytes, so as to limit the overhead of hashing. */ - hash = DatumGetUInt32(hash_any((unsigned char *) authoritative_data, - Min(len, PG_CACHE_LINE_SIZE))); + hash = hash_bytes((unsigned char *) authoritative_data, + Min(len, PG_CACHE_LINE_SIZE)); if (len > PG_CACHE_LINE_SIZE) hash ^= murmurhash32((uint32) len); diff --git a/src/backend/utils/cache/funccache.c b/src/backend/utils/cache/funccache.c index 701c294b88d..68bbf0b971c 100644 --- a/src/backend/utils/cache/funccache.c +++ b/src/backend/utils/cache/funccache.c @@ -89,13 +89,13 @@ cfunc_hash(const void *key, Size keysize) Assert(keysize == sizeof(CachedFunctionHashKey)); /* Hash all the fixed fields except callResultType */ - h = DatumGetUInt32(hash_any((const unsigned char *) k, - offsetof(CachedFunctionHashKey, callResultType))); + h = hash_bytes((const unsigned char *) k, + offsetof(CachedFunctionHashKey, callResultType)); /* Incorporate input argument types */ if (k->nargs > 0) h = hash_combine(h, - DatumGetUInt32(hash_any((const unsigned char *) k->argtypes, - k->nargs * sizeof(Oid)))); + hash_bytes((const unsigned char *) k->argtypes, + k->nargs * sizeof(Oid))); /* Incorporate callResultType if present */ if (k->callResultType) h = hash_combine(h, hashRowType(k->callResultType)); -- 2.43.0