From c082768a857ebd7a0a534ee497761dca0c621f64 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Sun, 26 Sep 2021 11:13:27 -0500 Subject: [PATCH 2/9] comments grammar: extended (and other) stats See: 202109272104.7t253iw236fb@alvherre.pgsql 070d2e19e40897d857f570f24888fc30727ed9c0 609b0652af00374b89411ea2613fd5bb92bca92c a4d75c86bf15220df22de0a92c819ecef9db3849 7300a699502fe5432b05fbc75baca534b080bebb ccaa3569f58796868303629bc2d63ddddb599b38 --- src/backend/commands/statscmds.c | 4 ++-- src/backend/statistics/README | 2 +- src/backend/statistics/dependencies.c | 8 ++++---- src/backend/statistics/extended_stats.c | 4 ++-- src/backend/utils/adt/pgstatfuncs.c | 4 ++-- src/backend/utils/adt/ruleutils.c | 2 +- src/include/statistics/extended_stats_internal.h | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/backend/commands/statscmds.c b/src/backend/commands/statscmds.c index 26ebd0819d6..2e41745646b 100644 --- a/src/backend/commands/statscmds.c +++ b/src/backend/commands/statscmds.c @@ -377,7 +377,7 @@ CreateStatistics(CreateStatsStmt *stmt) /* * If no statistic type was specified, build them all (but only when the - * statistics is defined on more than one column/expression). + * statistics object is defined on more than one column/expression). */ if ((!requested_type) && (numcols >= 2)) { @@ -432,7 +432,7 @@ CreateStatistics(CreateStatsStmt *stmt) * similar to why we don't bother with extracting columns from * expressions. It's either expensive or very easy to defeat for * determined user, and there's no risk if we allow such statistics (the - * statistics is useless, but harmless). + * statistic is useless, but harmless). */ foreach(cell, stxexprs) { diff --git a/src/backend/statistics/README b/src/backend/statistics/README index 13a97a35662..b87ca4734b2 100644 --- a/src/backend/statistics/README +++ b/src/backend/statistics/README @@ -24,7 +24,7 @@ There are currently several kinds of extended statistics: Compatible clause types ----------------------- -Each type of statistics may be used to estimate some subset of clause types. +Each type of statistic may be used to estimate some subset of clause types. (a) functional dependencies - equality clauses (AND), possibly IS NULL diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c index e6e2835345e..a54e038d6a1 100644 --- a/src/backend/statistics/dependencies.c +++ b/src/backend/statistics/dependencies.c @@ -846,7 +846,7 @@ dependency_is_compatible_clause(Node *clause, Index relid, AttrNumber *attnum) AttrNumber clause_attnum; /* - * Had we found incompatible clause in the arguments, treat the + * If we found an incompatible clause in the arguments, treat the * whole clause as incompatible. */ if (!dependency_is_compatible_clause((Node *) lfirst(lc), @@ -1274,7 +1274,7 @@ dependency_is_compatible_expression(Node *clause, Index relid, List *statlist, N Node *or_expr = NULL; /* - * Had we found incompatible expression in the arguments, treat + * If we found an incompatible expression in the arguments, treat * the whole expression as incompatible. */ if (!dependency_is_compatible_expression((Node *) lfirst(lc), relid, @@ -1725,7 +1725,7 @@ dependencies_clauselist_selectivity(PlannerInfo *root, /* * For expressions, we need to do two translations. First - * we have to translate the negative attnum to index in + * we have to translate the negative attnum to an index in * the list of expressions (in the statistics object). * Then we need to see if there's a matching clause. The * index of the unique expression determines the attnum @@ -1733,7 +1733,7 @@ dependencies_clauselist_selectivity(PlannerInfo *root, */ idx = -(1 + attnum); - /* Is the expression index is valid? */ + /* Is the expression index valid? */ Assert((idx >= 0) && (idx < list_length(stat->exprs))); expr = (Node *) list_nth(stat->exprs, idx); diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c index bdc21bb4577..edc7352562c 100644 --- a/src/backend/statistics/extended_stats.c +++ b/src/backend/statistics/extended_stats.c @@ -1214,8 +1214,8 @@ stat_covers_expressions(StatisticExtInfo *stat, List *exprs, /* * choose_best_statistics - * Look for and return statistics with the specified 'requiredkind' which - * have keys that match at least two of the given attnums. Return NULL if + * Look for and return the statistics object with the specified 'requiredkind' which + * has keys that match at least two of the given attnums. Return NULL if * there's no match. * * The current selection criteria is very simple - we choose the statistics diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index 6cddd74aa76..fb46153d8bb 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -1749,7 +1749,7 @@ pg_stat_get_archiver(PG_FUNCTION_ARGS) } /* - * Get the statistics for the replication slot. If the slot statistics is not + * Get the statistics for the replication slot. If the slot statistics are not * available, return all-zeroes stats. */ Datum @@ -1821,7 +1821,7 @@ pg_stat_get_replication_slot(PG_FUNCTION_ARGS) /* * Get the subscription statistics for the given subscription. If the - * subscription statistics is not available, return all-zeros stats. + * subscription statistics are not available, return all-zeros stats. */ Datum pg_stat_get_subscription_stats(PG_FUNCTION_ARGS) diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 9ac42efdbc3..da59c85d3d5 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -1699,7 +1699,7 @@ pg_get_statisticsobj_worker(Oid statextid, bool columns_only, bool missing_ok) * will create all statistics types on a newer postgres version, if * the statistics had all options enabled on the original version. * - * But if the statistics is defined on just a single column, it has to + * But if the statistics are defined on just a single column, it has to * be an expression statistics. In that case we don't need to specify * kinds. */ diff --git a/src/include/statistics/extended_stats_internal.h b/src/include/statistics/extended_stats_internal.h index 7b55eb8ffac..72f94814704 100644 --- a/src/include/statistics/extended_stats_internal.h +++ b/src/include/statistics/extended_stats_internal.h @@ -57,7 +57,7 @@ typedef struct SortItem int count; } SortItem; -/* a unified representation of the data the statistics is built on */ +/* a unified representation of the data the statistics object is built on */ typedef struct StatsBuildData { int numrows; -- 2.25.1