From 45edde037efc6ec76714e0be7309b348fe34351e Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Wed, 11 May 2022 15:38:55 +0900 Subject: [PATCH] Fix typos and grammar in code and test comments This fixes the grammar of some comments in a couple of tests (SQL and TAP), and in some C files. Author: Justin Pryzby Discussion: https://postgr.es/m/20220511020334.GH19626@telsasoft.com --- contrib/citext/expected/citext.out | 2 +- contrib/citext/expected/citext_1.out | 2 +- contrib/citext/sql/citext.sql | 2 +- src/backend/executor/execGrouping.c | 2 +- src/backend/parser/parse_expr.c | 2 +- src/backend/replication/basebackup_target.c | 2 +- src/bin/pg_basebackup/bbstreamer_tar.c | 2 +- src/bin/pg_rewind/t/007_standby_source.pl | 2 +- src/bin/pg_rewind/t/009_growing_files.pl | 2 +- src/test/regress/expected/psql.out | 2 +- src/test/regress/sql/psql.sql | 2 +- src/test/ssl/t/SSL/Backend/OpenSSL.pm | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/citext/expected/citext.out b/contrib/citext/expected/citext.out index 5afcc50920..1c55598136 100644 --- a/contrib/citext/expected/citext.out +++ b/contrib/citext/expected/citext.out @@ -2270,7 +2270,7 @@ SELECT COUNT(*) = 8::bigint AS t FROM try; INSERT INTO try VALUES ( to_char( now()::timestamp, 'HH12:MI:SS') ), - ( to_char( now() + '1 sec'::interval, 'HH12:MI:SS') ), -- timetamptz + ( to_char( now() + '1 sec'::interval, 'HH12:MI:SS') ), -- timestamptz ( to_char( '15h 2m 12s'::interval, 'HH24:MI:SS') ), ( to_char( current_date, '999') ), ( to_char( 125::int, '999') ), diff --git a/contrib/citext/expected/citext_1.out b/contrib/citext/expected/citext_1.out index 8aa2b9e1db..4a979d7a0d 100644 --- a/contrib/citext/expected/citext_1.out +++ b/contrib/citext/expected/citext_1.out @@ -2270,7 +2270,7 @@ SELECT COUNT(*) = 8::bigint AS t FROM try; INSERT INTO try VALUES ( to_char( now()::timestamp, 'HH12:MI:SS') ), - ( to_char( now() + '1 sec'::interval, 'HH12:MI:SS') ), -- timetamptz + ( to_char( now() + '1 sec'::interval, 'HH12:MI:SS') ), -- timestamptz ( to_char( '15h 2m 12s'::interval, 'HH24:MI:SS') ), ( to_char( current_date, '999') ), ( to_char( 125::int, '999') ), diff --git a/contrib/citext/sql/citext.sql b/contrib/citext/sql/citext.sql index 8c87be6b1d..b329253d37 100644 --- a/contrib/citext/sql/citext.sql +++ b/contrib/citext/sql/citext.sql @@ -696,7 +696,7 @@ SELECT to_timestamp('05 Dec 2000', 'DD Mon YYYY'::citext) SELECT COUNT(*) = 8::bigint AS t FROM try; INSERT INTO try VALUES ( to_char( now()::timestamp, 'HH12:MI:SS') ), - ( to_char( now() + '1 sec'::interval, 'HH12:MI:SS') ), -- timetamptz + ( to_char( now() + '1 sec'::interval, 'HH12:MI:SS') ), -- timestamptz ( to_char( '15h 2m 12s'::interval, 'HH24:MI:SS') ), ( to_char( current_date, '999') ), ( to_char( 125::int, '999') ), diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c index 5da4b37530..0cc54a3449 100644 --- a/src/backend/executor/execGrouping.c +++ b/src/backend/executor/execGrouping.c @@ -246,7 +246,7 @@ BuildTupleHashTableExt(PlanState *parent, } /* - * BuildTupleHashTable is a backwards-compatibilty wrapper for + * BuildTupleHashTable is a backwards-compatibility wrapper for * BuildTupleHashTableExt(), that allocates the hashtable's metadata in * tablecxt. Note that hashtables created this way cannot be reset leak-free * with ResetTupleHashTable(). diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 33eb19a33f..c1f194cc5b 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -4536,7 +4536,7 @@ transformJsonParseExpr(ParseState *pstate, JsonParseExpr *jsexpr) else { /* - * Coerce argument to target type using CAST for compatibilty with PG + * Coerce argument to target type using CAST for compatibility with PG * function-like CASTs. */ arg = transformJsonValueExprExt(pstate, jsexpr->expr, JS_FORMAT_JSON, diff --git a/src/backend/replication/basebackup_target.c b/src/backend/replication/basebackup_target.c index cff65611ef..35202576ae 100644 --- a/src/backend/replication/basebackup_target.c +++ b/src/backend/replication/basebackup_target.c @@ -1,7 +1,7 @@ /*------------------------------------------------------------------------- * * basebackup_target.c - * Base backups can be "targetted," which means that they can be sent + * Base backups can be "targeted", which means that they can be sent * somewhere other than to the client which requested the backup. * Furthermore, new targets can be defined by extensions. This file * contains code to support that functionality. diff --git a/src/bin/pg_basebackup/bbstreamer_tar.c b/src/bin/pg_basebackup/bbstreamer_tar.c index fcbad579df..ef5586c488 100644 --- a/src/bin/pg_basebackup/bbstreamer_tar.c +++ b/src/bin/pg_basebackup/bbstreamer_tar.c @@ -423,7 +423,7 @@ bbstreamer_tar_archiver_content(bbstreamer *streamer, data = buffer; len = pad_bytes; - /* Don't do this agian unless we replace another header. */ + /* Don't do this again unless we replace another header. */ mystreamer->rearchive_member = false; } else if (context == BBSTREAMER_ARCHIVE_TRAILER) diff --git a/src/bin/pg_rewind/t/007_standby_source.pl b/src/bin/pg_rewind/t/007_standby_source.pl index 47320ea5a6..f89a4df09d 100644 --- a/src/bin/pg_rewind/t/007_standby_source.pl +++ b/src/bin/pg_rewind/t/007_standby_source.pl @@ -141,7 +141,7 @@ move( # Restart the node. $node_c->start; -# set RewindTest::node_primary to point to the rewinded node, so that we can +# set RewindTest::node_primary to point to the rewound node, so that we can # use check_query() $node_primary = $node_c; diff --git a/src/bin/pg_rewind/t/009_growing_files.pl b/src/bin/pg_rewind/t/009_growing_files.pl index 2c81406cc0..a5a58dbe06 100644 --- a/src/bin/pg_rewind/t/009_growing_files.pl +++ b/src/bin/pg_rewind/t/009_growing_files.pl @@ -47,7 +47,7 @@ mkdir "$standby_pgdata/tst_both_dir"; append_to_file "$standby_pgdata/tst_both_dir/file1", 'a'; # Run pg_rewind and pipe the output from the run into the extra file we want -# to copy. This will ensure that the file is continously growing during the +# to copy. This will ensure that the file is continuously growing during the # copy operation and the result will be an error. my $ret = run_log( [ diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out index 1c5b5d2763..2a38a93a3b 100644 --- a/src/test/regress/expected/psql.out +++ b/src/test/regress/expected/psql.out @@ -5481,7 +5481,7 @@ INSERT INTO bla VALUES ('Susie'); -- succeeds INSERT INTO bla VALUES ('Rosalyn') \; -- will rollback SELECT 'before error' AS show \; -- will show nevertheless! SELECT psql_error('boum!') \; -- failure - SELECT 'after error' AS noshow; -- hidden by preceeding error + SELECT 'after error' AS noshow; -- hidden by preceding error show -------------- before error diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql index 6fc0ac6bd1..1149c6a839 100644 --- a/src/test/regress/sql/psql.sql +++ b/src/test/regress/sql/psql.sql @@ -1432,7 +1432,7 @@ INSERT INTO bla VALUES ('Susie'); -- succeeds INSERT INTO bla VALUES ('Rosalyn') \; -- will rollback SELECT 'before error' AS show \; -- will show nevertheless! SELECT psql_error('boum!') \; -- failure - SELECT 'after error' AS noshow; -- hidden by preceeding error + SELECT 'after error' AS noshow; -- hidden by preceding error INSERT INTO bla(s) VALUES ('Moe') \; -- will rollback SELECT psql_error('bam!'); INSERT INTO bla VALUES ('Miss Wormwood'); -- succeeds diff --git a/src/test/ssl/t/SSL/Backend/OpenSSL.pm b/src/test/ssl/t/SSL/Backend/OpenSSL.pm index 1546b5081b..d6d99fa636 100644 --- a/src/test/ssl/t/SSL/Backend/OpenSSL.pm +++ b/src/test/ssl/t/SSL/Backend/OpenSSL.pm @@ -135,7 +135,7 @@ sub get_sslkey =item $backend->set_server_cert(params) Change the configuration to use given server cert, key and crl file(s). The -following paramters are supported: +following parameters are supported: =over