Remove useless/superfluous Datum conversions

petere · petere · commit dcfc0f891273 · 2025-08-08T22:06:57.000+02:00
Remove useless DatumGetFoo() and FooGetDatum() calls. These are places where no conversion from or to Datum was actually happening. We think these extra calls covered here were harmless. Some actual bugs that were discovered during this process have been committed separately (80c758a, 2242b26). 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/src/backend/commands/alter.c b/src/backend/commands/alter.c
@@ -220,7 +220,7 @@ AlterObjectRename_internal(Relation rel, Oid objectId, const char *new_name)
 		Assert(!isnull);
 		ownerId = DatumGetObjectId(datum);
 
-		if (!has_privs_of_role(GetUserId(), DatumGetObjectId(ownerId)))
+		if (!has_privs_of_role(GetUserId(), ownerId))
 			aclcheck_error(ACLCHECK_NOT_OWNER, get_object_type(classId, objectId),
 						   old_name);
 
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c
@@ -2815,7 +2815,7 @@ ExecJustHashVarImpl(ExprState *state, TupleTableSlot *slot, bool *isnull)
 	*isnull = false;
 
 	if (!fcinfo->args[0].isnull)
-		return DatumGetUInt32(hashop->d.hashdatum.fn_addr(fcinfo));
+		return hashop->d.hashdatum.fn_addr(fcinfo);
 	else
 		return (Datum) 0;
 }
@@ -2849,7 +2849,7 @@ ExecJustHashVarVirtImpl(ExprState *state, TupleTableSlot *slot, bool *isnull)
 	*isnull = false;
 
 	if (!fcinfo->args[0].isnull)
-		return DatumGetUInt32(hashop->d.hashdatum.fn_addr(fcinfo));
+		return hashop->d.hashdatum.fn_addr(fcinfo);
 	else
 		return (Datum) 0;
 }
@@ -2892,7 +2892,7 @@ ExecJustHashOuterVarStrict(ExprState *state, ExprContext *econtext,
 	if (!fcinfo->args[0].isnull)
 	{
 		*isnull = false;
-		return DatumGetUInt32(hashop->d.hashdatum.fn_addr(fcinfo));
+		return hashop->d.hashdatum.fn_addr(fcinfo);
 	}
 	else
 	{
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
@@ -725,10 +725,9 @@ EnableDisableRule(Relation rel, const char *rulename,
 	/*
 	 * Change ev_enabled if it is different from the desired new state.
 	 */
-	if (DatumGetChar(ruleform->ev_enabled) !=
-		fires_when)
+	if (ruleform->ev_enabled != fires_when)
 	{
-		ruleform->ev_enabled = CharGetDatum(fires_when);
+		ruleform->ev_enabled = fires_when;
 		CatalogTupleUpdate(pg_rewrite_desc, &ruletup->t_self, ruletup);
 
 		changed = true;
diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c
@@ -2618,7 +2618,7 @@ make_build_data(Relation rel, StatExtEntry *stat, int numrows, HeapTuple *rows,
 			}
 			else
 			{
-				result->values[idx][i] = (Datum) datum;
+				result->values[idx][i] = datum;
 				result->nulls[idx][i] = false;
 			}
 
diff --git a/src/backend/tsearch/ts_parse.c b/src/backend/tsearch/ts_parse.c
@@ -218,7 +218,7 @@ LexizeExec(LexizeData *ld, ParsedLex **correspondLexem)
 					 * position and go to multiword mode
 					 */
 
-					ld->curDictId = DatumGetObjectId(map->dictIds[i]);
+					ld->curDictId = map->dictIds[i];
 					ld->posDict = i + 1;
 					ld->curSub = curVal->next;
 					if (res)
@@ -275,7 +275,7 @@ LexizeExec(LexizeData *ld, ParsedLex **correspondLexem)
 				 * dictionaries ?
 				 */
 				for (i = 0; i < map->len && !dictExists; i++)
-					if (ld->curDictId == DatumGetObjectId(map->dictIds[i]))
+					if (ld->curDictId == map->dictIds[i])
 						dictExists = true;
 
 				if (!dictExists)
diff --git a/src/backend/utils/activity/pgstat.c b/src/backend/utils/activity/pgstat.c
@@ -821,7 +821,7 @@ pgstat_force_next_flush(void)
 static bool
 match_db_entries(PgStatShared_HashEntry *entry, Datum match_data)
 {
-	return entry->key.dboid == DatumGetObjectId(MyDatabaseId);
+	return entry->key.dboid == MyDatabaseId;
 }
 
 /*
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
@@ -904,7 +904,7 @@ json_unique_hash(const void *key, Size keysize)
 
 	hash ^= hash_bytes((const unsigned char *) entry->key, entry->key_len);
 
-	return DatumGetUInt32(hash);
+	return hash;
 }
 
 static int
diff --git a/src/backend/utils/adt/multirangetypes.c b/src/backend/utils/adt/multirangetypes.c
@@ -2082,15 +2082,14 @@ range_overleft_multirange_internal(TypeCacheEntry *rangetyp,
 	bool		empty;
 
 	if (RangeIsEmpty(r) || MultirangeIsEmpty(mr))
-		PG_RETURN_BOOL(false);
-
+		return false;
 
 	range_deserialize(rangetyp, r, &lower1, &upper1, &empty);
 	Assert(!empty);
 	multirange_get_bounds(rangetyp, mr, mr->rangeCount - 1,
 						  &lower2, &upper2);
 
-	PG_RETURN_BOOL(range_cmp_bounds(rangetyp, &upper1, &upper2) <= 0);
+	return (range_cmp_bounds(rangetyp, &upper1, &upper2) <= 0);
 }
 
 Datum
@@ -2167,7 +2166,7 @@ range_overright_multirange_internal(TypeCacheEntry *rangetyp,
 	bool		empty;
 
 	if (RangeIsEmpty(r) || MultirangeIsEmpty(mr))
-		PG_RETURN_BOOL(false);
+		return false;
 
 	range_deserialize(rangetyp, r, &lower1, &upper1, &empty);
 	Assert(!empty);
diff --git a/src/backend/utils/adt/rangetypes.c b/src/backend/utils/adt/rangetypes.c
@@ -1075,8 +1075,8 @@ range_union_internal(TypeCacheEntry *typcache, RangeType *r1, RangeType *r2,
 		return r1;
 
 	if (strict &&
-		!DatumGetBool(range_overlaps_internal(typcache, r1, r2)) &&
-		!DatumGetBool(range_adjacent_internal(typcache, r1, r2)))
+		!range_overlaps_internal(typcache, r1, r2) &&
+		!range_adjacent_internal(typcache, r1, r2))
 		ereport(ERROR,
 				(errcode(ERRCODE_DATA_EXCEPTION),
 				 errmsg("result of range union would not be contiguous")));
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
@@ -408,13 +408,12 @@ text_length(Datum str)
 {
 	/* fastpath when max encoding length is one */
 	if (pg_database_encoding_max_length() == 1)
-		PG_RETURN_INT32(toast_raw_datum_size(str) - VARHDRSZ);
+		return (toast_raw_datum_size(str) - VARHDRSZ);
 	else
 	{
 		text	   *t = DatumGetTextPP(str);
 
-		PG_RETURN_INT32(pg_mbstrlen_with_len(VARDATA_ANY(t),
-											 VARSIZE_ANY_EXHDR(t)));
+		return (pg_mbstrlen_with_len(VARDATA_ANY(t), VARSIZE_ANY_EXHDR(t)));
 	}
 }
 
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
@@ -3184,7 +3184,7 @@ AssertPendingSyncs_RelationCache(void)
 		if ((LockTagType) locallock->tag.lock.locktag_type !=
 			LOCKTAG_RELATION)
 			continue;
-		relid = ObjectIdGetDatum(locallock->tag.lock.locktag_field2);
+		relid = locallock->tag.lock.locktag_field2;
 		r = RelationIdGetRelation(relid);
 		if (!RelationIsValid(r))
 			continue;

Original file line number	Diff line number	Diff line change
`@@ -2815,7 +2815,7 @@ ExecJustHashVarImpl(ExprState state, TupleTableSlot slot, bool *isnull)`
`2815`	`2815`	`*isnull = false;`
`2816`	`2816`
`2817`	`2817`	`if (!fcinfo->args[0].isnull)`
`2818`		`- return DatumGetUInt32(hashop->d.hashdatum.fn_addr(fcinfo));`
	`2818`	`+ return hashop->d.hashdatum.fn_addr(fcinfo);`
`2819`	`2819`	`else`
`2820`	`2820`	`return (Datum) 0;`
`2821`	`2821`	`}`
`@@ -2849,7 +2849,7 @@ ExecJustHashVarVirtImpl(ExprState state, TupleTableSlot slot, bool *isnull)`
`2849`	`2849`	`*isnull = false;`
`2850`	`2850`
`2851`	`2851`	`if (!fcinfo->args[0].isnull)`
`2852`		`- return DatumGetUInt32(hashop->d.hashdatum.fn_addr(fcinfo));`
	`2852`	`+ return hashop->d.hashdatum.fn_addr(fcinfo);`
`2853`	`2853`	`else`
`2854`	`2854`	`return (Datum) 0;`
`2855`	`2855`	`}`
`@@ -2892,7 +2892,7 @@ ExecJustHashOuterVarStrict(ExprState state, ExprContext econtext,`
`2892`	`2892`	`if (!fcinfo->args[0].isnull)`
`2893`	`2893`	`{`
`2894`	`2894`	`*isnull = false;`
`2895`		`- return DatumGetUInt32(hashop->d.hashdatum.fn_addr(fcinfo));`
	`2895`	`+ return hashop->d.hashdatum.fn_addr(fcinfo);`
`2896`	`2896`	`}`
`2897`	`2897`	`else`
`2898`	`2898`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2618,7 +2618,7 @@ make_build_data(Relation rel, StatExtEntry stat, int numrows, HeapTuple rows,`
`2618`	`2618`	`}`
`2619`	`2619`	`else`
`2620`	`2620`	`{`
`2621`		`- result->values[idx][i] = (Datum) datum;`
	`2621`	`+ result->values[idx][i] = datum;`
`2622`	`2622`	`result->nulls[idx][i] = false;`
`2623`	`2623`	`}`
`2624`	`2624`
Original file line number	Diff line number	Diff line change
`@@ -821,7 +821,7 @@ pgstat_force_next_flush(void)`
`821`	`821`	`static bool`
`822`	`822`	`match_db_entries(PgStatShared_HashEntry *entry, Datum match_data)`
`823`	`823`	`{`
`824`		`- return entry->key.dboid == DatumGetObjectId(MyDatabaseId);`
	`824`	`+ return entry->key.dboid == MyDatabaseId;`
`825`	`825`	`}`
`826`	`826`
`827`	`827`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -904,7 +904,7 @@ json_unique_hash(const void *key, Size keysize)`
`904`	`904`
`905`	`905`	`hash ^= hash_bytes((const unsigned char *) entry->key, entry->key_len);`
`906`	`906`
`907`		`- return DatumGetUInt32(hash);`
	`907`	`+ return hash;`
`908`	`908`	`}`
`909`	`909`
`910`	`910`	`static int`
Original file line number	Diff line number	Diff line change
`@@ -408,13 +408,12 @@ text_length(Datum str)`
`408`	`408`	`{`
`409`	`409`	`/* fastpath when max encoding length is one */`
`410`	`410`	`if (pg_database_encoding_max_length() == 1)`
`411`		`- PG_RETURN_INT32(toast_raw_datum_size(str) - VARHDRSZ);`
	`411`	`+ return (toast_raw_datum_size(str) - VARHDRSZ);`
`412`	`412`	`else`
`413`	`413`	`{`
`414`	`414`	`text *t = DatumGetTextPP(str);`
`415`	`415`
`416`		`- PG_RETURN_INT32(pg_mbstrlen_with_len(VARDATA_ANY(t),`
`417`		`- VARSIZE_ANY_EXHDR(t)));`
	`416`	`+ return (pg_mbstrlen_with_len(VARDATA_ANY(t), VARSIZE_ANY_EXHDR(t)));`
`418`	`417`	`}`
`419`	`418`	`}`
`420`	`419`