From 16568c0a8aee85052cfd3e465d21d1e1d1b442e1 Mon Sep 17 00:00:00 2001 From: Tomas Vondra Date: Tue, 23 Mar 2021 04:53:11 +0100 Subject: [PATCH] Use correct spelling of statistics kind A couple error messages and comments used 'statistic kind', not the correct 'statistics kind'. Fix and backpatch all the way back to 10, where extended statistics were introduced. Backpatch-through: 10 --- doc/src/sgml/catalogs.sgml | 2 +- src/backend/statistics/dependencies.c | 2 +- src/backend/statistics/extended_stats.c | 2 +- src/backend/statistics/mvdistinct.c | 2 +- src/include/nodes/relation.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml index 9d6d65acd9..29f60fd92a 100644 --- a/doc/src/sgml/catalogs.sgml +++ b/doc/src/sgml/catalogs.sgml @@ -6575,7 +6575,7 @@ SCRAM-SHA-256$<iteration count>:&l char[] - An array containing codes for the enabled statistic kinds; + An array containing codes for the enabled statistics kinds; valid values are: d for n-distinct statistics, f for functional dependency statistics diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c index 1a41d2d969..e7f2d6c0ca 100644 --- a/src/backend/statistics/dependencies.c +++ b/src/backend/statistics/dependencies.c @@ -642,7 +642,7 @@ statext_dependencies_load(Oid mvoid) Anum_pg_statistic_ext_stxdependencies, &isnull); if (isnull) elog(ERROR, - "requested statistic kind \"%c\" is not yet built for statistics object %u", + "requested statistics kind \"%c\" is not yet built for statistics object %u", STATS_EXT_DEPENDENCIES, mvoid); result = statext_dependencies_deserialize(DatumGetByteaPP(deps)); diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c index 2df5f7dc3a..e6423eb628 100644 --- a/src/backend/statistics/extended_stats.c +++ b/src/backend/statistics/extended_stats.c @@ -44,7 +44,7 @@ typedef struct StatExtEntry char *schema; /* statistics object's schema */ char *name; /* statistics object's name */ Bitmapset *columns; /* attribute numbers covered by the object */ - List *types; /* 'char' list of enabled statistic kinds */ + List *types; /* 'char' list of enabled statistics kinds */ } StatExtEntry; diff --git a/src/backend/statistics/mvdistinct.c b/src/backend/statistics/mvdistinct.c index f8dba74cbd..593932455f 100644 --- a/src/backend/statistics/mvdistinct.c +++ b/src/backend/statistics/mvdistinct.c @@ -139,7 +139,7 @@ statext_ndistinct_load(Oid mvoid) Anum_pg_statistic_ext_stxndistinct, &isnull); if (isnull) elog(ERROR, - "requested statistic kind \"%c\" is not yet built for statistics object %u", + "requested statistics kind \"%c\" is not yet built for statistics object %u", STATS_EXT_NDISTINCT, mvoid); result = statext_ndistinct_deserialize(DatumGetByteaPP(ndist)); diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 098116b0d8..c658571418 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -857,7 +857,7 @@ typedef struct StatisticExtInfo Oid statOid; /* OID of the statistics row */ RelOptInfo *rel; /* back-link to statistic's table */ - char kind; /* statistic kind of this entry */ + char kind; /* statistics kind of this entry */ Bitmapset *keys; /* attnums of the columns covered */ } StatisticExtInfo;