Skip to content

Commit 6f7ca62

Browse files
committed
Ensure acquire_inherited_sample_rows sets its output parameters.
The totalrows/totaldeadrows outputs were left uninitialized in cases where we find no analyzable child tables of a partitioned table. This could lead to setting the partitioned table's pg_class.reltuples value to garbage. It's not clear that that would have any very bad effects in practice, but fix it anyway because it's making valgrind unhappy. Reported and diagnosed by Alexander Lakhin (bug #17880). Discussion: https://postgr.es/m/17880-9282037c923d856e@postgresql.org
1 parent df567fb commit 6f7ca62

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/backend/commands/analyze.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,6 +1391,10 @@ acquire_inherited_sample_rows(Relation onerel, int elevel,
13911391
ListCell *lc;
13921392
bool has_child;
13931393

1394+
/* Initialize output parameters to zero now, in case we exit early */
1395+
*totalrows = 0;
1396+
*totaldeadrows = 0;
1397+
13941398
/*
13951399
* Find all members of inheritance set. We only need AccessShareLock on
13961400
* the children.
@@ -1524,8 +1528,6 @@ acquire_inherited_sample_rows(Relation onerel, int elevel,
15241528
pgstat_progress_update_param(PROGRESS_ANALYZE_CHILD_TABLES_TOTAL,
15251529
nrels);
15261530
numrows = 0;
1527-
*totalrows = 0;
1528-
*totaldeadrows = 0;
15291531
for (i = 0; i < nrels; i++)
15301532
{
15311533
Relation childrel = rels[i];

0 commit comments

Comments
 (0)