Mop-up for Datum conversion cleanups.

tglsfdc · tglsfdc · commit 665c3dbba497 · 2025-08-08T18:44:57.000-04:00
Fix a couple more places where an explicit Datum conversion is needed (not clear how we missed these in ff89e18 and previous commits). Replace the minority usage "(Datum) NULL" with "(Datum) 0". The former depends on the assumption that Datum is the same width as Pointer, the latter doesn't. Anyway consistency is a good thing. This is, I believe, the last of the notational mop-up needed before we can consider changing Datum to uint64 everywhere. It's also important cleanup for more aggressive ideas such as making Datum a struct. Discussion: https://postgr.es/m/1749799.1752797397@sss.pgh.pa.us Discussion: https://postgr.es/m/8246d7ff-f4b7-4363-913e-827dadfeb145@eisentraut.org
diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c
@@ -84,7 +84,7 @@ _ltree_compress(PG_FUNCTION_ARGS)
 					  entry->rel, entry->page,
 					  entry->offset, false);
 	}
-	else if (!LTG_ISALLTRUE(entry->key))
+	else if (!LTG_ISALLTRUE(DatumGetPointer(entry->key)))
 	{
 		int32		i;
 		ltree_gist *key;
diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
@@ -654,7 +654,7 @@ AggregateCreate(const char *aggName,
 	for (i = 0; i < Natts_pg_aggregate; i++)
 	{
 		nulls[i] = false;
-		values[i] = (Datum) NULL;
+		values[i] = (Datum) 0;
 		replaces[i] = true;
 	}
 	values[Anum_pg_aggregate_aggfnoid - 1] = ObjectIdGetDatum(procOid);
diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c
@@ -179,7 +179,7 @@ CreateConstraintEntry(const char *constraintName,
 	for (i = 0; i < Natts_pg_constraint; i++)
 	{
 		nulls[i] = false;
-		values[i] = (Datum) NULL;
+		values[i] = (Datum) 0;
 	}
 
 	conOid = GetNewOidWithIndex(conDesc, ConstraintOidIndexId,
diff --git a/src/backend/catalog/pg_conversion.c b/src/backend/catalog/pg_conversion.c
@@ -87,7 +87,7 @@ ConversionCreate(const char *conname, Oid connamespace,
 	for (i = 0; i < Natts_pg_conversion; i++)
 	{
 		nulls[i] = false;
-		values[i] = (Datum) NULL;
+		values[i] = (Datum) 0;
 	}
 
 	/* form a tuple */
diff --git a/src/backend/catalog/pg_namespace.c b/src/backend/catalog/pg_namespace.c
@@ -76,7 +76,7 @@ NamespaceCreate(const char *nspName, Oid ownerId, bool isTemp)
 	for (i = 0; i < Natts_pg_namespace; i++)
 	{
 		nulls[i] = false;
-		values[i] = (Datum) NULL;
+		values[i] = (Datum) 0;
 	}
 
 	nspoid = GetNewOidWithIndex(nspdesc, NamespaceOidIndexId,
diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
@@ -225,7 +225,7 @@ OperatorShellMake(const char *operatorName,
 	for (i = 0; i < Natts_pg_operator; ++i)
 	{
 		nulls[i] = false;
-		values[i] = (Datum) NULL;	/* redundant, but safe */
+		values[i] = (Datum) 0;	/* redundant, but safe */
 	}
 
 	/*
@@ -453,7 +453,7 @@ OperatorCreate(const char *operatorName,
 
 	for (i = 0; i < Natts_pg_operator; ++i)
 	{
-		values[i] = (Datum) NULL;
+		values[i] = (Datum) 0;
 		replaces[i] = true;
 		nulls[i] = false;
 	}
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
@@ -80,7 +80,7 @@ TypeShellMake(const char *typeName, Oid typeNamespace, Oid ownerId)
 	for (i = 0; i < Natts_pg_type; ++i)
 	{
 		nulls[i] = false;
-		values[i] = (Datum) NULL;	/* redundant, but safe */
+		values[i] = (Datum) 0;	/* redundant, but safe */
 	}
 
 	/*
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
@@ -1258,7 +1258,7 @@ SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool *isnull)
 	{
 		SPI_result = SPI_ERROR_NOATTRIBUTE;
 		*isnull = true;
-		return (Datum) NULL;
+		return (Datum) 0;
 	}
 
 	return heap_getattr(tuple, fnumber, tupdesc, isnull);
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
@@ -630,7 +630,7 @@ readDatum(bool typbyval)
 		}
 	}
 	else if (length <= 0)
-		res = (Datum) NULL;
+		res = (Datum) 0;
 	else
 	{
 		s = (char *) palloc(length);
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
@@ -2027,7 +2027,7 @@ each_worker_jsonb(FunctionCallInfo fcinfo, const char *funcname, bool as_text)
 				{
 					/* a json null is an sql null in text mode */
 					nulls[1] = true;
-					values[1] = (Datum) NULL;
+					values[1] = (Datum) 0;
 				}
 				else
 					values[1] = PointerGetDatum(JsonbValueAsText(&v));
@@ -2266,7 +2266,7 @@ elements_worker_jsonb(FunctionCallInfo fcinfo, const char *funcname,
 				{
 					/* a json null is an sql null in text mode */
 					nulls[0] = true;
-					values[0] = (Datum) NULL;
+					values[0] = (Datum) 0;
 				}
 				else
 					values[0] = PointerGetDatum(JsonbValueAsText(&v));
@@ -2389,7 +2389,7 @@ elements_array_element_end(void *state, bool isnull)
 	if (isnull && _state->normalize_results)
 	{
 		nulls[0] = true;
-		values[0] = (Datum) NULL;
+		values[0] = (Datum) 0;
 	}
 	else if (_state->next_scalar)
 	{
diff --git a/src/backend/utils/adt/rangetypes.c b/src/backend/utils/adt/rangetypes.c
@@ -1343,9 +1343,9 @@ range_fast_cmp(Datum a, Datum b, SortSupport ssup)
 			cmp = range_cmp_bounds(typcache, &upper1, &upper2);
 	}
 
-	if ((Datum) range_a != a)
+	if ((Pointer) range_a != DatumGetPointer(a))
 		pfree(range_a);
-	if ((Datum) range_b != b)
+	if ((Pointer) range_b != DatumGetPointer(b))
 		pfree(range_b);
 
 	return cmp;
diff --git a/src/include/access/htup_details.h b/src/include/access/htup_details.h
@@ -884,7 +884,7 @@ fastgetattr(HeapTuple tup, int attnum, TupleDesc tupleDesc, bool *isnull)
 		if (att_isnull(attnum - 1, tup->t_data->t_bits))
 		{
 			*isnull = true;
-			return (Datum) NULL;
+			return (Datum) 0;
 		}
 		else
 			return nocachegetattr(tup, attnum, tupleDesc);
diff --git a/src/include/access/itup.h b/src/include/access/itup.h
@@ -154,7 +154,7 @@ index_getattr(IndexTuple tup, int attnum, TupleDesc tupleDesc, bool *isnull)
 		if (att_isnull(attnum - 1, (bits8 *) tup + sizeof(IndexTupleData)))
 		{
 			*isnull = true;
-			return (Datum) NULL;
+			return (Datum) 0;
 		}
 		else
 			return nocache_index_getattr(tup, attnum, tupleDesc);

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ _ltree_compress(PG_FUNCTION_ARGS)`
`84`	`84`	`entry->rel, entry->page,`
`85`	`85`	`entry->offset, false);`
`86`	`86`	`}`
`87`		`- else if (!LTG_ISALLTRUE(entry->key))`
	`87`	`+ else if (!LTG_ISALLTRUE(DatumGetPointer(entry->key)))`
`88`	`88`	`{`
`89`	`89`	`int32 i;`
`90`	`90`	`ltree_gist *key;`
Original file line number	Diff line number	Diff line change
`@@ -654,7 +654,7 @@ AggregateCreate(const char *aggName,`
`654`	`654`	`for (i = 0; i < Natts_pg_aggregate; i++)`
`655`	`655`	`{`
`656`	`656`	`nulls[i] = false;`
`657`		`- values[i] = (Datum) NULL;`
	`657`	`+ values[i] = (Datum) 0;`
`658`	`658`	`replaces[i] = true;`
`659`	`659`	`}`
`660`	`660`	`values[Anum_pg_aggregate_aggfnoid - 1] = ObjectIdGetDatum(procOid);`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ CreateConstraintEntry(const char *constraintName,`
`179`	`179`	`for (i = 0; i < Natts_pg_constraint; i++)`
`180`	`180`	`{`
`181`	`181`	`nulls[i] = false;`
`182`		`- values[i] = (Datum) NULL;`
	`182`	`+ values[i] = (Datum) 0;`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`conOid = GetNewOidWithIndex(conDesc, ConstraintOidIndexId,`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ ConversionCreate(const char *conname, Oid connamespace,`
`87`	`87`	`for (i = 0; i < Natts_pg_conversion; i++)`
`88`	`88`	`{`
`89`	`89`	`nulls[i] = false;`
`90`		`- values[i] = (Datum) NULL;`
	`90`	`+ values[i] = (Datum) 0;`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`/* form a tuple */`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ NamespaceCreate(const char *nspName, Oid ownerId, bool isTemp)`
`76`	`76`	`for (i = 0; i < Natts_pg_namespace; i++)`
`77`	`77`	`{`
`78`	`78`	`nulls[i] = false;`
`79`		`- values[i] = (Datum) NULL;`
	`79`	`+ values[i] = (Datum) 0;`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`nspoid = GetNewOidWithIndex(nspdesc, NamespaceOidIndexId,`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ OperatorShellMake(const char *operatorName,`
`225`	`225`	`for (i = 0; i < Natts_pg_operator; ++i)`
`226`	`226`	`{`
`227`	`227`	`nulls[i] = false;`
`228`		`- values[i] = (Datum) NULL; /* redundant, but safe */`
	`228`	`+ values[i] = (Datum) 0; /* redundant, but safe */`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`/*`
`@@ -453,7 +453,7 @@ OperatorCreate(const char *operatorName,`
`453`	`453`
`454`	`454`	`for (i = 0; i < Natts_pg_operator; ++i)`
`455`	`455`	`{`
`456`		`- values[i] = (Datum) NULL;`
	`456`	`+ values[i] = (Datum) 0;`
`457`	`457`	`replaces[i] = true;`
`458`	`458`	`nulls[i] = false;`
`459`	`459`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ TypeShellMake(const char *typeName, Oid typeNamespace, Oid ownerId)`
`80`	`80`	`for (i = 0; i < Natts_pg_type; ++i)`
`81`	`81`	`{`
`82`	`82`	`nulls[i] = false;`
`83`		`- values[i] = (Datum) NULL; /* redundant, but safe */`
	`83`	`+ values[i] = (Datum) 0; /* redundant, but safe */`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -1258,7 +1258,7 @@ SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool *isnull)`
`1258`	`1258`	`{`
`1259`	`1259`	`SPI_result = SPI_ERROR_NOATTRIBUTE;`
`1260`	`1260`	`*isnull = true;`
`1261`		`- return (Datum) NULL;`
	`1261`	`+ return (Datum) 0;`
`1262`	`1262`	`}`
`1263`	`1263`
`1264`	`1264`	`return heap_getattr(tuple, fnumber, tupdesc, isnull);`
Original file line number	Diff line number	Diff line change
`@@ -630,7 +630,7 @@ readDatum(bool typbyval)`
`630`	`630`	`}`
`631`	`631`	`}`
`632`	`632`	`else if (length <= 0)`
`633`		`- res = (Datum) NULL;`
	`633`	`+ res = (Datum) 0;`
`634`	`634`	`else`
`635`	`635`	`{`
`636`	`636`	`s = (char *) palloc(length);`
Original file line number	Diff line number	Diff line change
`@@ -2027,7 +2027,7 @@ each_worker_jsonb(FunctionCallInfo fcinfo, const char *funcname, bool as_text)`
`2027`	`2027`	`{`
`2028`	`2028`	`/* a json null is an sql null in text mode */`
`2029`	`2029`	`nulls[1] = true;`
`2030`		`- values[1] = (Datum) NULL;`
	`2030`	`+ values[1] = (Datum) 0;`
`2031`	`2031`	`}`
`2032`	`2032`	`else`
`2033`	`2033`	`values[1] = PointerGetDatum(JsonbValueAsText(&v));`
`@@ -2266,7 +2266,7 @@ elements_worker_jsonb(FunctionCallInfo fcinfo, const char *funcname,`
`2266`	`2266`	`{`
`2267`	`2267`	`/* a json null is an sql null in text mode */`
`2268`	`2268`	`nulls[0] = true;`
`2269`		`- values[0] = (Datum) NULL;`
	`2269`	`+ values[0] = (Datum) 0;`
`2270`	`2270`	`}`
`2271`	`2271`	`else`
`2272`	`2272`	`values[0] = PointerGetDatum(JsonbValueAsText(&v));`
`@@ -2389,7 +2389,7 @@ elements_array_element_end(void *state, bool isnull)`
`2389`	`2389`	`if (isnull && _state->normalize_results)`
`2390`	`2390`	`{`
`2391`	`2391`	`nulls[0] = true;`
`2392`		`- values[0] = (Datum) NULL;`
	`2392`	`+ values[0] = (Datum) 0;`
`2393`	`2393`	`}`
`2394`	`2394`	`else if (_state->next_scalar)`
`2395`	`2395`	`{`