From eea5d4b5dd12e66097f911590c76564353c9e161 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Tue, 29 Mar 2022 21:42:36 -0700 Subject: [PATCH v68 06/31] pgstat: add pgstat_copy_relation_stats(). Author: Andres Freund Discussion: https://postgr.es/m/20220303021600.hs34ghqcw6zcokdh@alap3.anarazel.de --- src/include/pgstat.h | 2 ++ src/backend/catalog/index.c | 26 ++-------------- src/backend/utils/activity/pgstat_relation.c | 32 ++++++++++++++++++++ 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/src/include/pgstat.h b/src/include/pgstat.h index 7ce26f61642..ed37523ce17 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -1058,6 +1058,8 @@ extern PgStat_BackendFunctionEntry *find_funcstat_entry(Oid func_id); * Functions in pgstat_relation.c */ +extern void pgstat_copy_relation_stats(Relation dstrel, Relation srcrel); + extern void pgstat_relation_init(Relation rel); extern void pgstat_report_autovac(Oid dboid); diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index dd715ca0609..063be25062b 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -1734,30 +1734,8 @@ index_concurrently_swap(Oid newIndexId, Oid oldIndexId, const char *oldName) changeDependenciesOf(RelationRelationId, oldIndexId, newIndexId); changeDependenciesOn(RelationRelationId, oldIndexId, newIndexId); - /* - * Copy over statistics from old to new index - */ - { - PgStat_StatTabEntry *tabentry; - - tabentry = pgstat_fetch_stat_tabentry(oldIndexId); - if (tabentry) - { - if (pgstat_relation_should_count(newClassRel)) - { - newClassRel->pgstat_info->t_counts.t_numscans = tabentry->numscans; - newClassRel->pgstat_info->t_counts.t_tuples_returned = tabentry->tuples_returned; - newClassRel->pgstat_info->t_counts.t_tuples_fetched = tabentry->tuples_fetched; - newClassRel->pgstat_info->t_counts.t_blocks_fetched = tabentry->blocks_fetched; - newClassRel->pgstat_info->t_counts.t_blocks_hit = tabentry->blocks_hit; - - /* - * The data will be sent by the next pgstat_report_stat() - * call. - */ - } - } - } + /* copy over statistics from old to new index */ + pgstat_copy_relation_stats(newClassRel, oldClassRel); /* Copy data of pg_statistic from the old index to the new one */ CopyStatistics(oldIndexId, newIndexId); diff --git a/src/backend/utils/activity/pgstat_relation.c b/src/backend/utils/activity/pgstat_relation.c index 6413b3cc132..b0ac406e5fd 100644 --- a/src/backend/utils/activity/pgstat_relation.c +++ b/src/backend/utils/activity/pgstat_relation.c @@ -95,6 +95,38 @@ bool have_relation_stats; static HTAB *pgStatTabHash = NULL; +/* + * Copy stats between relations. This is used for things like REINDEX + * CONCURRENTLY. + */ +void +pgstat_copy_relation_stats(Relation dst, Relation src) +{ + PgStat_StatTabEntry *srcstats; + + srcstats = pgstat_fetch_stat_tabentry(RelationGetRelid(src)); + + if (!srcstats) + return; + + if (pgstat_relation_should_count(dst)) + { + /* + * XXX: temporarily this does not actually quite do what the name + * says, and just copy index related fields. A subsequent commit will + * do more. + */ + + dst->pgstat_info->t_counts.t_numscans = srcstats->numscans; + dst->pgstat_info->t_counts.t_tuples_returned = srcstats->tuples_returned; + dst->pgstat_info->t_counts.t_tuples_fetched = srcstats->tuples_fetched; + dst->pgstat_info->t_counts.t_blocks_fetched = srcstats->blocks_fetched; + dst->pgstat_info->t_counts.t_blocks_hit = srcstats->blocks_hit; + + /* the data will be sent by the next pgstat_report_stat() call */ + } +} + /* * Initialize a relcache entry to count access statistics. * Called whenever a relation is opened. -- 2.35.1.677.gabf474a5dd