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

diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index 612cc698027056ae77100a1c79732eec32ea373e..4dff3f60a29891e8aab744aa07829737cc169588 100644 (file)
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -7326,7 +7326,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</replaceable>:<replaceable>&l
        <structfield>stxkind</structfield> <type>char[]</type>
       </para>
       <para>
-       An array containing codes for the enabled statistic kinds;
+       An array containing codes for the enabled statistics kinds;
        valid values are:
        <literal>d</literal> for n-distinct statistics,
        <literal>f</literal> for functional dependency statistics, and

diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c
index 3e37e2758ca0c1f88c29fdf30f5f36035e839416..552843f397caedf58e70b85d853dc4b691f22080 100644 (file)
--- a/src/backend/statistics/dependencies.c
+++ b/src/backend/statistics/dependencies.c
@@ -639,7 +639,7 @@ statext_dependencies_load(Oid mvoid)
                                                   Anum_pg_statistic_ext_data_stxddependencies, &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 ab6f1e1c9dc985754563e173bba6272a8fc7c246..0c80e55d107e11244db6f63e596103ed9468ef7f 100644 (file)
--- a/src/backend/statistics/extended_stats.c
+++ b/src/backend/statistics/extended_stats.c
@@ -64,7 +64,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 */
        int                     stattarget;             /* statistics target (-1 for default) */
 } StatExtEntry;
 

diff --git a/src/backend/statistics/mcv.c b/src/backend/statistics/mcv.c
index 6a262f1543669b6e2e82be5ef4a81c9d57d765aa..d3bfeff364d811f4bda1d40b899ecc6d56bb4379 100644 (file)
--- a/src/backend/statistics/mcv.c
+++ b/src/backend/statistics/mcv.c
@@ -569,7 +569,7 @@ statext_mcv_load(Oid mvoid)
 
        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_mcv_deserialize(DatumGetByteaP(mcvlist));

diff --git a/src/backend/statistics/mvdistinct.c b/src/backend/statistics/mvdistinct.c
index 4b86f0ab2d13f8ed3b6fbbad7fc3b13d5178ba75..e87c2d8fbd4dc87ba310d5ca3a29f24cee427963 100644 (file)
--- a/src/backend/statistics/mvdistinct.c
+++ b/src/backend/statistics/mvdistinct.c
@@ -153,7 +153,7 @@ statext_ndistinct_load(Oid mvoid)
                                                        Anum_pg_statistic_ext_data_stxdndistinct, &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/pathnodes.h b/src/include/nodes/pathnodes.h
index 10f0a149e91474a8f4443b620cf0595df7d95c3b..69150e46ebdc4175a59d64b2bef21f94e936d3c6 100644 (file)
--- a/src/include/nodes/pathnodes.h
+++ b/src/include/nodes/pathnodes.h
@@ -912,7 +912,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;