database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-10-23 13:29:09 +03:00
Code Activity

Fix signed/unsigned integer handling in pg_restore_relation_stats()

Browse Source 
The pg_class fields relpages, relallvisible, and relallfrozen are of
type int32, but the statistics restoration code and some statistics
code in postgres_fdw internally dealt with them as uint32 for a little
bit, after which they would turn back into int32.  This doesn't make
sense, so fix it to use int32 consistently throughout.

In passing, change a float to float4 to similarly make the C type
consistent with the SQL type.

Reviewed-by: Chao Li <li.evan.chao@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/db993f34-e3e1-4e6e-85c3-4f248d2ff29b%40eisentraut.org
This commit is contained in:
Peter Eisentraut
2026-08-25 08:39:16 +02:00
parent db2d99323f
commit b345a554ed
2 changed files with 14 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
contrib/postgres_fdw/postgres_fdw.c
View File

@@ -623,7 +623,6 @@ static bool import_fetched_statistics(Relation relation,
static char *get_opt_value(PGresult *res, int row, int col);
static void set_text_arg(NullableDatum *arg, const char *s);
static void set_int32_arg(NullableDatum *arg, const char *s);
static void set_uint32_arg(NullableDatum *arg, const char *s);
static void set_float_arg(NullableDatum *arg, const char *s);
static void set_floatarr_arg(NullableDatum *arg, const char *s);
static void produce_tuple_asynchronously(AsyncRequest *areq, bool fetch);
@@ -6336,7 +6335,7 @@ import_fetched_statistics(Relation relation,
Assert(PQntuples(res) == 1);
/* Set the remaining parameters. */
set_uint32_arg(&args[1], get_opt_value(res, 0, RELSTATS_RELPAGES));
set_int32_arg(&args[1], get_opt_value(res, 0, RELSTATS_RELPAGES));
Assert(!args[1].isnull);
set_float_arg(&args[2], get_opt_value(res, 0, RELSTATS_RELTUPLES));
Assert(!args[2].isnull);
@@ -6407,26 +6406,6 @@ set_int32_arg(NullableDatum *arg, const char *s)
}
}
/*
* Convenience routine for setting optional uint32 arguments
*/
static void
set_uint32_arg(NullableDatum *arg, const char *s)
{
if (s)
{
uint32 val = uint32in_subr(s, NULL, "uint32", NULL);
arg->value = UInt32GetDatum(val);
arg->isnull = false;
}
else
{
arg->value = (Datum) 0;
arg->isnull = true;
}
}
/*
* Convenience routine for setting optional float arguments
*/

26
src/backend/statistics/relation_stats.c
View File

@@ -99,13 +99,13 @@ relation_statistics_update(FunctionCallInfo fcinfo)
static bool
relation_statistics_update_internal(Oid reloid, FunctionCallInfo fcinfo)
{
BlockNumber relpages = 0;
int32 relpages = 0;
bool update_relpages = false;
float reltuples = 0;
float4 reltuples = 0;
bool update_reltuples = false;
BlockNumber relallvisible = 0;
int32 relallvisible = 0;
bool update_relallvisible = false;
BlockNumber relallfrozen = 0;
int32 relallfrozen = 0;
bool update_relallfrozen = false;
Relation crel;
HeapTuple ctup;
@@ -118,7 +118,7 @@ relation_statistics_update_internal(Oid reloid, FunctionCallInfo fcinfo)
if (!PG_ARGISNULL(RELPAGES_ARG))
{
relpages = PG_GETARG_UINT32(RELPAGES_ARG);
relpages = PG_GETARG_INT32(RELPAGES_ARG);
update_relpages = true;
}
@@ -145,13 +145,13 @@ relation_statistics_update_internal(Oid reloid, FunctionCallInfo fcinfo)
if (!PG_ARGISNULL(RELALLVISIBLE_ARG))
{
relallvisible = PG_GETARG_UINT32(RELALLVISIBLE_ARG);
relallvisible = PG_GETARG_INT32(RELALLVISIBLE_ARG);
update_relallvisible = true;
}
if (!PG_ARGISNULL(RELALLFROZEN_ARG))
{
relallfrozen = PG_GETARG_UINT32(RELALLFROZEN_ARG);
relallfrozen = PG_GETARG_INT32(RELALLFROZEN_ARG);
update_relallfrozen = true;
}
@@ -170,7 +170,7 @@ relation_statistics_update_internal(Oid reloid, FunctionCallInfo fcinfo)
if (update_relpages && relpages != pgcform->relpages)
{
replaces[nreplaces] = Anum_pg_class_relpages;
values[nreplaces] = UInt32GetDatum(relpages);
values[nreplaces] = Int32GetDatum(relpages);
nreplaces++;
}
@@ -184,14 +184,14 @@ relation_statistics_update_internal(Oid reloid, FunctionCallInfo fcinfo)
if (update_relallvisible && relallvisible != pgcform->relallvisible)
{
replaces[nreplaces] = Anum_pg_class_relallvisible;
values[nreplaces] = UInt32GetDatum(relallvisible);
values[nreplaces] = Int32GetDatum(relallvisible);
nreplaces++;
}
if (update_relallfrozen && relallfrozen != pgcform->relallfrozen)
{
replaces[nreplaces] = Anum_pg_class_relallfrozen;
values[nreplaces] = UInt32GetDatum(relallfrozen);
values[nreplaces] = Int32GetDatum(relallfrozen);
nreplaces++;
}
@@ -231,13 +231,13 @@ pg_clear_relation_stats(PG_FUNCTION_ARGS)
newfcinfo->args[0].isnull = PG_ARGISNULL(0);
newfcinfo->args[1].value = PG_GETARG_DATUM(1);
newfcinfo->args[1].isnull = PG_ARGISNULL(1);
newfcinfo->args[2].value = UInt32GetDatum(0);
newfcinfo->args[2].value = Int32GetDatum(0);
newfcinfo->args[2].isnull = false;
newfcinfo->args[3].value = Float4GetDatum(-1.0);
newfcinfo->args[3].isnull = false;
newfcinfo->args[4].value = UInt32GetDatum(0);
newfcinfo->args[4].value = Int32GetDatum(0);
newfcinfo->args[4].isnull = false;
newfcinfo->args[5].value = UInt32GetDatum(0);
newfcinfo->args[5].value = Int32GetDatum(0);
newfcinfo->args[5].isnull = false;
relation_statistics_update(newfcinfo);