Skip to content

Commit 65266d9

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 8d684c4 commit 65266d9

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
@@ -1241,6 +1241,10 @@ acquire_inherited_sample_rows(Relation onerel, int elevel,
12411241
ListCell *lc;
12421242
bool has_child;
12431243

1244+
/* Initialize output parameters to zero now, in case we exit early */
1245+
*totalrows = 0;
1246+
*totaldeadrows = 0;
1247+
12441248
/*
12451249
* Find all members of inheritance set. We only need AccessShareLock on
12461250
* the children.
@@ -1374,8 +1378,6 @@ acquire_inherited_sample_rows(Relation onerel, int elevel,
13741378
pgstat_progress_update_param(PROGRESS_ANALYZE_CHILD_TABLES_TOTAL,
13751379
nrels);
13761380
numrows = 0;
1377-
*totalrows = 0;
1378-
*totaldeadrows = 0;
13791381
for (i = 0; i < nrels; i++)
13801382
{
13811383
Relation childrel = rels[i];

0 commit comments

Comments
 (0)