Fix various hash function uses

petere · petere · commit 2ad6e80de9a6 · 2025-08-05T11:47:23.000+02:00
These instances were using Datum-returning functions where a lower-level function returning uint32 would be more appropriate. Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://www.postgresql.org/message-id/flat/8246d7ff-f4b7-4363-913e-827dadfeb145%40eisentraut.org
diff --git a/contrib/sepgsql/uavc.c b/contrib/sepgsql/uavc.c
@@ -66,8 +66,8 @@ static char *avc_unlabeled;		/* system 'unlabeled' label */
 static uint32
 sepgsql_avc_hash(const char *scontext, const char *tcontext, uint16 tclass)
 {
-	return hash_any((const unsigned char *) scontext, strlen(scontext))
-		^ hash_any((const unsigned char *) tcontext, strlen(tcontext))
+	return hash_bytes((const unsigned char *) scontext, strlen(scontext))
+		^ hash_bytes((const unsigned char *) tcontext, strlen(tcontext))
 		^ tclass;
 }
 
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
@@ -815,10 +815,10 @@ hashRowType(TupleDesc desc)
 	uint32		s;
 	int			i;
 
-	s = hash_combine(0, hash_uint32(desc->natts));
-	s = hash_combine(s, hash_uint32(desc->tdtypeid));
+	s = hash_combine(0, hash_bytes_uint32(desc->natts));
+	s = hash_combine(s, hash_bytes_uint32(desc->tdtypeid));
 	for (i = 0; i < desc->natts; ++i)
-		s = hash_combine(s, hash_uint32(TupleDescAttr(desc, i)->atttypid));
+		s = hash_combine(s, hash_bytes_uint32(TupleDescAttr(desc, i)->atttypid));
 
 	return s;
 }
diff --git a/src/backend/storage/file/fileset.c b/src/backend/storage/file/fileset.c
@@ -185,7 +185,7 @@ FileSetPath(char *path, FileSet *fileset, Oid tablespace)
 static Oid
 ChooseTablespace(const FileSet *fileset, const char *name)
 {
-	uint32		hash = hash_any((const unsigned char *) name, strlen(name));
+	uint32		hash = hash_bytes((const unsigned char *) name, strlen(name));
 
 	return fileset->tablespaces[hash % fileset->ntablespaces];
 }
diff --git a/src/backend/utils/adt/multirangetypes.c b/src/backend/utils/adt/multirangetypes.c
@@ -2833,7 +2833,7 @@ hash_multirange(PG_FUNCTION_ARGS)
 			upper_hash = 0;
 
 		/* Merge hashes of flags and bounds */
-		range_hash = hash_uint32((uint32) flags);
+		range_hash = hash_bytes_uint32((uint32) flags);
 		range_hash ^= lower_hash;
 		range_hash = pg_rotate_left32(range_hash, 1);
 		range_hash ^= upper_hash;
diff --git a/src/backend/utils/adt/rangetypes.c b/src/backend/utils/adt/rangetypes.c
@@ -1444,7 +1444,7 @@ hash_range(PG_FUNCTION_ARGS)
 		upper_hash = 0;
 
 	/* Merge hashes of flags and bounds */
-	result = hash_uint32((uint32) flags);
+	result = hash_bytes_uint32((uint32) flags);
 	result ^= lower_hash;
 	result = pg_rotate_left32(result, 1);
 	result ^= upper_hash;
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
@@ -213,7 +213,7 @@ namehashfast(Datum datum)
 {
 	char	   *key = NameStr(*DatumGetName(datum));
 
-	return hash_any((unsigned char *) key, strlen(key));
+	return hash_bytes((unsigned char *) key, strlen(key));
 }
 
 static bool

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ static char avc_unlabeled; / system 'unlabeled' label */`
`66`	`66`	`static uint32`
`67`	`67`	`sepgsql_avc_hash(const char scontext, const char tcontext, uint16 tclass)`
`68`	`68`	`{`
`69`		`- return hash_any((const unsigned char *) scontext, strlen(scontext))`
`70`		`- ^ hash_any((const unsigned char *) tcontext, strlen(tcontext))`
	`69`	`+ return hash_bytes((const unsigned char *) scontext, strlen(scontext))`
	`70`	`+ ^ hash_bytes((const unsigned char *) tcontext, strlen(tcontext))`
`71`	`71`	`^ tclass;`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ FileSetPath(char path, FileSet fileset, Oid tablespace)`
`185`	`185`	`static Oid`
`186`	`186`	`ChooseTablespace(const FileSet fileset, const char name)`
`187`	`187`	`{`
`188`		`- uint32 hash = hash_any((const unsigned char *) name, strlen(name));`
	`188`	`+ uint32 hash = hash_bytes((const unsigned char *) name, strlen(name));`
`189`	`189`
`190`	`190`	`return fileset->tablespaces[hash % fileset->ntablespaces];`
`191`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ namehashfast(Datum datum)`
`213`	`213`	`{`
`214`	`214`	`char key = NameStr(DatumGetName(datum));`
`215`	`215`
`216`		`- return hash_any((unsigned char *) key, strlen(key));`
	`216`	`+ return hash_bytes((unsigned char *) key, strlen(key));`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`static bool`