public inbox for [email protected]help / color / mirror / Atom feed
[PATCH 06/21] One fewer (not one less) 24+ messages / 2 participants [nested] [flat]
* [PATCH 06/21] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index 2a12071bad..7413748a71 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --jI8keyz6grp/JLjh Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* [PATCH 06/18] One fewer (not one less) @ 2021-01-18 20:37 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Justin Pryzby @ 2021-01-18 20:37 UTC (permalink / raw) --- contrib/pageinspect/heapfuncs.c | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- src/backend/access/common/heaptuple.c | 4 ++-- src/backend/commands/analyze.c | 2 +- src/backend/utils/adt/jsonpath_exec.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/misc/sampling.c | 2 +- src/backend/utils/mmgr/freepage.c | 2 +- src/bin/pgbench/pgbench.c | 2 +- src/include/pg_config_manual.h | 4 ++-- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/test/regress/expected/geometry.out | 2 +- src/test/regress/sql/geometry.sql | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 9abcee32af..f6760eb31e 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -338,7 +338,7 @@ tuple_data_split_internal(Oid relid, char *tupdata, attr = TupleDescAttr(tupdesc, i); /* - * Tuple header can specify less attributes than tuple descriptor as + * Tuple header can specify fewer attributes than tuple descriptor as * ALTER TABLE ADD COLUMN without DEFAULT keyword does not actually * change tuples in pages, so attributes with numbers greater than * (t_infomask2 & HEAP_NATTS_MASK) should be treated as NULL. diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index cebc09ef91..1b00e543a6 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -619,7 +619,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR"; name such as <literal>de_DE</literal> can be considered unique within a given database even though it would not be unique globally. Use of the stripped collation names is recommended, since it will - make one less thing you need to change if you decide to change to + make one fewer thing you need to change if you decide to change to another database encoding. Note however that the <literal>default</literal>, <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of the database encoding. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 0b24a55505..693423e524 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -867,7 +867,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable> Before <productname>PostgreSQL</productname> version 8.3, the name of a generated array type was always exactly the element type's name with one underscore character (<literal>_</literal>) prepended. (Type names were - therefore restricted in length to one less character than other names.) + therefore restricted in length to one fewer character than other names.) While this is still usually the case, the array type name may vary from this in case of maximum-length names or collisions with user type names that begin with underscore. Writing code that depends on this convention diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index e81addcfa9..aa172d102b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1266,7 +1266,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <para> The query trees generated from rule actions are thrown into the rewrite system again, and maybe more rules get applied resulting - in more or less query trees. + in additional or fewer query trees. So a rule's actions must have either a different command type or a different result relation than the rule itself is on, otherwise this recursive process will end up in an infinite loop. diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 24a27e387d..0b56b0fa5a 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -719,11 +719,11 @@ heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest) } /* - * Expand a tuple which has less attributes than required. For each attribute + * Expand a tuple which has fewer attributes than required. For each attribute * not present in the sourceTuple, if there is a missing value that will be * used. Otherwise the attribute will be set to NULL. * - * The source tuple must have less attributes than the required number. + * The source tuple must have fewer attributes than the required number. * * Only one of targetHeapTuple and targetMinimalTuple may be supplied. The * other argument must be NULL. diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 7295cf0215..64908ac39c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1003,7 +1003,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) * As of May 2004 we use a new two-stage method: Stage one selects up * to targrows random blocks (or all blocks, if there aren't so many). * Stage two scans these blocks and uses the Vitter algorithm to create - * a random sample of targrows rows (or less, if there are less in the + * a random sample of targrows rows (or fewer, if there are fewer in the * sample of blocks). The two stages are executed simultaneously: each * block is processed as soon as stage one returns its number and while * the rows are read stage two controls which ones are to be inserted diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 4d185c27b4..078aaef539 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -263,7 +263,7 @@ static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, * implement @? and @@ operators, which in turn are intended to have an * index support. Thus, it's desirable to make it easier to achieve * consistency between index scan results and sequential scan results. - * So, we throw as less errors as possible. Regarding this function, + * So, we throw as few errors as possible. Regarding this function, * such behavior also matches behavior of JSON_EXISTS() clause of * SQL/JSON. Regarding jsonb_path_match(), this function doesn't have * an analogy in SQL/JSON, so we define its behavior on our own. diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 47ca4ddbb5..52314d3aa1 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -645,7 +645,7 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq, /* * The calculation so far gave us a selectivity for the "<=" case. - * We'll have one less tuple for "<" and one additional tuple for + * We'll have one fewer tuple for "<" and one additional tuple for * ">=", the latter of which we'll reverse the selectivity for * below, so we can simply subtract one tuple for both cases. The * cases that need this adjustment can be identified by iseq being diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index fa2b49c676..55c9445898 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1497,7 +1497,7 @@ GetCatCacheHashValue(CatCache *cache, * It doesn't make any sense to specify all of the cache's key columns * here: since the key is unique, there could be at most one match, so * you ought to use SearchCatCache() instead. Hence this function takes - * one less Datum argument than SearchCatCache() does. + * one fewer Datum argument than SearchCatCache() does. * * The caller must not modify the list object or the pointed-to tuples, * and must call ReleaseCatCacheList() when done with the list. diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c index 0c327e823f..7348b86682 100644 --- a/src/backend/utils/misc/sampling.c +++ b/src/backend/utils/misc/sampling.c @@ -42,7 +42,7 @@ BlockSampler_Init(BlockSampler bs, BlockNumber nblocks, int samplesize, bs->N = nblocks; /* measured table size */ /* - * If we decide to reduce samplesize for tables that have less or not much + * If we decide to reduce samplesize for tables that have fewer or not much * more than samplesize blocks, here is the place to do it. */ bs->n = samplesize; diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c index e4ee1aab97..10a1effb74 100644 --- a/src/backend/utils/mmgr/freepage.c +++ b/src/backend/utils/mmgr/freepage.c @@ -495,7 +495,7 @@ FreePageManagerDump(FreePageManager *fpm) * if we search the parent page for the first key greater than or equal to * the first key on the current page, the downlink to this page will be either * the exact index returned by the search (if the first key decreased) - * or one less (if the first key increased). + * or one fewer (if the first key increased). */ static void FreePageBtreeAdjustAncestorKeys(FreePageManager *fpm, FreePageBtree *btp) diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index a4a3f40048..627a244fb7 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -6458,7 +6458,7 @@ threadRun(void *arg) /* * If advanceConnectionState changed client to finished state, - * that's one less client that remains. + * that's one fewer client that remains. */ if (st->state == CSTATE_FINISHED || st->state == CSTATE_ABORTED) remains--; diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index d27c8601fa..e3d2e751ea 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -21,7 +21,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * Changing this requires an initdb. @@ -87,7 +87,7 @@ /* * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence, - * maximum usable pathname length is one less). + * maximum usable pathname length is one fewer). * * We'd use a standard system header symbol for this, if there weren't * so many to choose from: MAXPATHLEN, MAX_PATH, PATH_MAX are all diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index 67d3c7b4e4..9e73f1f1b1 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -7,7 +7,7 @@ /* * Maximum length for identifiers (e.g. table names, column names, - * function names). Names actually are limited to one less byte than this, + * function names). Names actually are limited to one fewer byte than this, * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 84f7eabb66..9799cfbdbd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -4325,7 +4325,7 @@ SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; <(100,1),115> | ((-15,1),(18.6827201635,82.3172798365),(100,116),(181.317279836,82.3172798365),(215,1),(181.317279836,-80.3172798365),(100,-114),(18.6827201635,-80.3172798365)) (6 rows) --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; ERROR: must request at least 2 points -- Zero radius error diff --git a/src/test/regress/sql/geometry.sql b/src/test/regress/sql/geometry.sql index 96df0ab05a..b0ab6d03ec 100644 --- a/src/test/regress/sql/geometry.sql +++ b/src/test/regress/sql/geometry.sql @@ -424,7 +424,7 @@ SELECT f1, f1::polygon FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- To polygon with less points SELECT f1, polygon(8, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; --- Too less points error +-- Too few points error SELECT f1, polygon(1, f1) FROM CIRCLE_TBL WHERE f1 >= '<(0,0),1>'; -- Zero radius error -- 2.17.0 --lc9FT7cWel8HagAv Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0007-function-comment-get_am_name.patch" ^ permalink raw reply [nested|flat] 24+ messages in thread
* Removing the fixed-size buffer restriction in hba.c @ 2023-07-24 17:53 Tom Lane <[email protected]> 0 siblings, 0 replies; 24+ messages in thread From: Tom Lane @ 2023-07-24 17:53 UTC (permalink / raw) To: [email protected] We got a complaint at [1] about how a not-so-unreasonable LDAP configuration can hit the "authentication file token too long, skipping" error case in hba.c's next_token(). I think we've seen similar complaints before, although a desultory archives search didn't turn one up. A minimum-change response would be to increase the MAX_TOKEN constant from 256 to (say) 1K or 10K. But it wouldn't be all that hard to replace the fixed-size buffer with a StringInfo, as attached. Given the infrequency of complaints, I'm inclined to apply the more thorough fix only in HEAD, and to just raise MAX_TOKEN in the back branches. Thoughts? regards, tom lane [1] https://www.postgresql.org/message-id/PH0PR04MB8294A4C5A65D9D492CBBD349C002A%40PH0PR04MB8294.namprd0... Attachments: [text/x-diff] v1-remove-hba-token-length-limit.patch (5.1K, ../../[email protected]/2-v1-remove-hba-token-length-limit.patch) download | inline diff: diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 5d4ddbb04d..629463a00f 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -56,8 +56,6 @@ #endif -#define MAX_TOKEN 256 - /* callback data for check_network_callback */ typedef struct check_network_data { @@ -161,8 +159,8 @@ pg_isblank(const char c) * commas, beginning of line, and end of line. Blank means space or tab. * * Tokens can be delimited by double quotes (this allows the inclusion of - * blanks or '#', but not newlines). As in SQL, write two double-quotes - * to represent a double quote. + * commas, blanks, and '#', but not newlines). As in SQL, write two + * double-quotes to represent a double quote. * * Comments (started by an unquoted '#') are skipped, i.e. the remainder * of the line is ignored. @@ -171,7 +169,7 @@ pg_isblank(const char c) * Thus, if a continuation occurs within quoted text or a comment, the * quoted text or comment is considered to continue to the next line.) * - * The token, if any, is returned at *buf (a buffer of size bufsz), and + * The token, if any, is returned into *buf, and * *lineptr is advanced past the token. * * Also, we set *initial_quote to indicate whether there was quoting before @@ -180,30 +178,28 @@ pg_isblank(const char c) * we want to allow that to support embedded spaces in file paths.) * * We set *terminating_comma to indicate whether the token is terminated by a - * comma (which is not returned). + * comma (which is not returned, nor advanced over). * * In event of an error, log a message at ereport level elevel, and also - * set *err_msg to a string describing the error. Currently the only - * possible error is token too long for buf. + * set *err_msg to a string describing the error. Currently no error + * conditions are defined. * - * If successful: store null-terminated token at *buf and return true. - * If no more tokens on line: set *buf = '\0' and return false. + * If successful: store dequoted token in *buf and return true. + * If no more tokens on line: set *buf to empty and return false. * If error: fill buf with truncated or misformatted token and return false. */ static bool -next_token(char **lineptr, char *buf, int bufsz, +next_token(char **lineptr, StringInfo buf, bool *initial_quote, bool *terminating_comma, int elevel, char **err_msg) { int c; - char *start_buf = buf; - char *end_buf = buf + (bufsz - 1); bool in_quote = false; bool was_quote = false; bool saw_quote = false; - Assert(end_buf > start_buf); - + /* Initialize output parameters */ + resetStringInfo(buf); *initial_quote = false; *terminating_comma = false; @@ -226,22 +222,6 @@ next_token(char **lineptr, char *buf, int bufsz, break; } - if (buf >= end_buf) - { - *buf = '\0'; - ereport(elevel, - (errcode(ERRCODE_CONFIG_FILE_ERROR), - errmsg("authentication file token too long, skipping: \"%s\"", - start_buf))); - *err_msg = "authentication file token too long"; - /* Discard remainder of line */ - while ((c = (*(*lineptr)++)) != '\0') - ; - /* Un-eat the '\0', in case we're called again */ - (*lineptr)--; - return false; - } - /* we do not pass back a terminating comma in the token */ if (c == ',' && !in_quote) { @@ -250,7 +230,7 @@ next_token(char **lineptr, char *buf, int bufsz, } if (c != '"' || was_quote) - *buf++ = c; + appendStringInfoChar(buf, c); /* Literal double-quote is two double-quotes */ if (in_quote && c == '"') @@ -262,7 +242,7 @@ next_token(char **lineptr, char *buf, int bufsz, { in_quote = !in_quote; saw_quote = true; - if (buf == start_buf) + if (buf->len == 0) *initial_quote = true; } @@ -275,9 +255,7 @@ next_token(char **lineptr, char *buf, int bufsz, */ (*lineptr)--; - *buf = '\0'; - - return (saw_quote || buf > start_buf); + return (saw_quote || buf->len > 0); } /* @@ -409,21 +387,23 @@ static List * next_field_expand(const char *filename, char **lineptr, int elevel, int depth, char **err_msg) { - char buf[MAX_TOKEN]; + StringInfoData buf; bool trailing_comma; bool initial_quote; List *tokens = NIL; + initStringInfo(&buf); + do { - if (!next_token(lineptr, buf, sizeof(buf), + if (!next_token(lineptr, &buf, &initial_quote, &trailing_comma, elevel, err_msg)) break; /* Is this referencing a file? */ - if (!initial_quote && buf[0] == '@' && buf[1] != '\0') - tokens = tokenize_expand_file(tokens, filename, buf + 1, + if (!initial_quote && buf.len > 1 && buf.data[0] == '@') + tokens = tokenize_expand_file(tokens, filename, buf.data + 1, elevel, depth + 1, err_msg); else { @@ -434,11 +414,13 @@ next_field_expand(const char *filename, char **lineptr, * for the list of tokens. */ oldcxt = MemoryContextSwitchTo(tokenize_context); - tokens = lappend(tokens, make_auth_token(buf, initial_quote)); + tokens = lappend(tokens, make_auth_token(buf.data, initial_quote)); MemoryContextSwitchTo(oldcxt); } } while (trailing_comma && (*err_msg == NULL)); + pfree(buf.data); + return tokens; } ^ permalink raw reply [nested|flat] 24+ messages in thread
end of thread, other threads:[~2023-07-24 17:53 UTC | newest] Thread overview: 24+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/21] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2021-01-18 20:37 [PATCH 06/18] One fewer (not one less) Justin Pryzby <[email protected]> 2023-07-24 17:53 Removing the fixed-size buffer restriction in hba.c Tom Lane <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox