Skip to content

Commit d0d92fe

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 33510bc commit d0d92fe

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
@@ -1206,6 +1206,10 @@ acquire_inherited_sample_rows(Relation onerel, int elevel,
12061206
ListCell *lc;
12071207
bool has_child;
12081208

1209+
/* Initialize output parameters to zero now, in case we exit early */
1210+
*totalrows = 0;
1211+
*totaldeadrows = 0;
1212+
12091213
/*
12101214
* Find all members of inheritance set. We only need AccessShareLock on
12111215
* the children.
@@ -1337,8 +1341,6 @@ acquire_inherited_sample_rows(Relation onerel, int elevel,
13371341
* clear that it's worth working harder.)
13381342
*/
13391343
numrows = 0;
1340-
*totalrows = 0;
1341-
*totaldeadrows = 0;
13421344
for (i = 0; i < nrels; i++)
13431345
{
13441346
Relation childrel = rels[i];

0 commit comments

Comments
 (0)