From 1fb6f62a84041b668fd9e85a2f33bb3a0fd28fdc Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Mon, 3 Jun 2019 13:44:03 +0900 Subject: [PATCH] Fix typos in various places Author: Andrea Gelmini Reviewed-by: Michael Paquier, Justin Pryzby Discussion: https://postgr.es/m/20190528181718.GA39034@glet --- contrib/citext/expected/citext.out | 2 +- contrib/citext/expected/citext_1.out | 2 +- contrib/citext/sql/citext.sql | 2 +- src/backend/access/gist/gist.c | 2 +- src/backend/access/heap/heapam_handler.c | 2 +- src/backend/jit/llvm/llvmjit_inline.cpp | 2 +- src/backend/rewrite/rewriteManip.c | 2 +- src/backend/storage/buffer/buf_init.c | 2 +- src/backend/storage/ipc/standby.c | 2 +- src/backend/utils/adt/geo_ops.c | 2 +- src/backend/utils/adt/inet_net_pton.c | 4 ++-- src/backend/utils/adt/jsonpath.c | 2 +- src/bin/pg_basebackup/t/010_pg_basebackup.pl | 2 +- src/bin/psql/command.c | 2 +- src/common/unicode/generate-norm_test_table.pl | 2 +- src/include/executor/tuptable.h | 4 ++-- src/include/fe_utils/conditional.h | 4 ++-- src/include/nodes/execnodes.h | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/contrib/citext/expected/citext.out b/contrib/citext/expected/citext.out index 94aba67cdb..96800be9c0 100644 --- a/contrib/citext/expected/citext.out +++ b/contrib/citext/expected/citext.out @@ -2609,7 +2609,7 @@ SELECT citext_pattern_ge('b'::citext, 'A'::citext) AS true; t (1 row) --- Multi-byte tests below are diabled like the sanity tests above. +-- Multi-byte tests below are disabled like the sanity tests above. -- Uncomment to run them. -- Test ~<~ and ~<=~ SELECT 'a'::citext ~<~ 'B'::citext AS t; diff --git a/contrib/citext/expected/citext_1.out b/contrib/citext/expected/citext_1.out index 187d3b5d2c..33e3676d3c 100644 --- a/contrib/citext/expected/citext_1.out +++ b/contrib/citext/expected/citext_1.out @@ -2609,7 +2609,7 @@ SELECT citext_pattern_ge('b'::citext, 'A'::citext) AS true; t (1 row) --- Multi-byte tests below are diabled like the sanity tests above. +-- Multi-byte tests below are disabled like the sanity tests above. -- Uncomment to run them. -- Test ~<~ and ~<=~ SELECT 'a'::citext ~<~ 'B'::citext AS t; diff --git a/contrib/citext/sql/citext.sql b/contrib/citext/sql/citext.sql index 0cc909eb52..261b73cfa6 100644 --- a/contrib/citext/sql/citext.sql +++ b/contrib/citext/sql/citext.sql @@ -810,7 +810,7 @@ SELECT citext_pattern_ge('b'::citext, 'a'::citext) AS true; SELECT citext_pattern_ge('B'::citext, 'a'::citext) AS true; SELECT citext_pattern_ge('b'::citext, 'A'::citext) AS true; --- Multi-byte tests below are diabled like the sanity tests above. +-- Multi-byte tests below are disabled like the sanity tests above. -- Uncomment to run them. -- Test ~<~ and ~<=~ diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index 45c00aaa87..470b121e7d 100644 --- a/src/backend/access/gist/gist.c +++ b/src/backend/access/gist/gist.c @@ -1533,7 +1533,7 @@ initGISTstate(Relation index) * The truncated tupdesc for non-leaf index tuples, which doesn't contain * the INCLUDE attributes. * - * It is used to form tuples during tuple adjustement and page split. + * It is used to form tuples during tuple adjustment and page split. * B-tree creates shortened tuple descriptor for every truncated tuple, * because it is doing this less often: it does not have to form truncated * tuples during page split. Also, B-tree is not adjusting tuples on diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c index a4a28e88ec..92ea1d163e 100644 --- a/src/backend/access/heap/heapam_handler.c +++ b/src/backend/access/heap/heapam_handler.c @@ -2362,7 +2362,7 @@ heapam_scan_sample_next_block(TableScanDesc scan, SampleScanState *scanstate) if (blockno >= hscan->rs_nblocks) { - /* wrap to begining of rel, might not have started at 0 */ + /* wrap to beginning of rel, might not have started at 0 */ blockno = 0; } diff --git a/src/backend/jit/llvm/llvmjit_inline.cpp b/src/backend/jit/llvm/llvmjit_inline.cpp index 07b5fc7b38..8005d43a84 100644 --- a/src/backend/jit/llvm/llvmjit_inline.cpp +++ b/src/backend/jit/llvm/llvmjit_inline.cpp @@ -308,7 +308,7 @@ llvm_build_inline_plan(llvm::Module *mod) * Check whether function and all its dependencies are too * big. Dependencies already counted for other functions that * will get inlined are not counted again. While this make - * things somewhat order dependant, I can't quite see a point + * things somewhat order dependent, I can't quite see a point * in a different behaviour. */ if (running_instcount > inlineState.costLimit) diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c index e20158b962..6189a06853 100644 --- a/src/backend/rewrite/rewriteManip.c +++ b/src/backend/rewrite/rewriteManip.c @@ -1015,7 +1015,7 @@ AddQual(Query *parsetree, Node *qual) errmsg("conditional UNION/INTERSECT/EXCEPT statements are not implemented"))); } - /* INTERSECT want's the original, but we need to copy - Jan */ + /* INTERSECT wants the original, but we need to copy - Jan */ copy = copyObject(qual); parsetree->jointree->quals = make_and_qual(parsetree->jointree->quals, diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c index b0ee3a26d6..ccd2c31c0b 100644 --- a/src/backend/storage/buffer/buf_init.c +++ b/src/backend/storage/buffer/buf_init.c @@ -179,7 +179,7 @@ BufferShmemSize(void) * and benchmarking has shown that keeping every BufferDesc aligned on a * cache line boundary is important for performance. So, instead, the * array of I/O locks is allocated in a separate tranche. Because those - * locks are not highly contentended, we lay out the array with minimal + * locks are not highly contended, we lay out the array with minimal * padding. */ size = add_size(size, mul_size(NBuffers, sizeof(LWLockMinimallyPadded))); diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c index 842fcabd97..25b7e314af 100644 --- a/src/backend/storage/ipc/standby.c +++ b/src/backend/storage/ipc/standby.c @@ -202,7 +202,7 @@ WaitExceedsMaxStandbyDelay(void) /* * Progressively increase the sleep times, but not to more than 1s, since - * pg_usleep isn't interruptable on some platforms. + * pg_usleep isn't interruptible on some platforms. */ standbyWait_us *= 2; if (standbyWait_us > 1000000) diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c index 2ecc73b772..373784fcc1 100644 --- a/src/backend/utils/adt/geo_ops.c +++ b/src/backend/utils/adt/geo_ops.c @@ -5315,7 +5315,7 @@ lseg_crossing(float8 x, float8 y, float8 prev_x, float8 prev_y) /* both non-positive so do not cross positive X-axis */ return 0; - /* x and y cross axises, see URL above point_inside() */ + /* x and y cross axes, see URL above point_inside() */ z = float8_mi(float8_mul(float8_mi(x, prev_x), y), float8_mul(float8_mi(y, prev_y), x)); if (FPzero(z)) diff --git a/src/backend/utils/adt/inet_net_pton.c b/src/backend/utils/adt/inet_net_pton.c index 6f3ece1209..c28809fad6 100644 --- a/src/backend/utils/adt/inet_net_pton.c +++ b/src/backend/utils/adt/inet_net_pton.c @@ -189,7 +189,7 @@ inet_cidr_pton_ipv4(const char *src, u_char *dst, size_t size) goto emsgsize; } - /* Firey death and destruction unless we prefetched EOS. */ + /* Fiery death and destruction unless we prefetched EOS. */ if (ch != '\0') goto enoent; @@ -309,7 +309,7 @@ inet_net_pton_ipv4(const char *src, u_char *dst) goto emsgsize; } - /* Firey death and destruction unless we prefetched EOS. */ + /* Fiery death and destruction unless we prefetched EOS. */ if (ch != '\0') goto enoent; diff --git a/src/backend/utils/adt/jsonpath.c b/src/backend/utils/adt/jsonpath.c index 10cd38a531..d5da155867 100644 --- a/src/backend/utils/adt/jsonpath.c +++ b/src/backend/utils/adt/jsonpath.c @@ -229,7 +229,7 @@ static int flattenJsonPathParseItem(StringInfo buf, JsonPathParseItem *item, int nestingLevel, bool insideArraySubscript) { - /* position from begining of jsonpath data */ + /* position from beginning of jsonpath data */ int32 pos = buf->len - JSONPATH_HDRSZ; int32 chld; int32 next; diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl index 7d59d3dffa..b7d36b65dd 100644 --- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl +++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl @@ -44,7 +44,7 @@ $node->command_fails( ok(!-d "$tempdir/backup", 'backup directory was cleaned up'); -# Create a backup directory that is not empty so the next commnd will fail +# Create a backup directory that is not empty so the next command will fail # but leave the data directory behind mkdir("$tempdir/backup") or BAIL_OUT("unable to create $tempdir/backup"); diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index a3280eeb18..695d6ba9f1 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -2937,7 +2937,7 @@ do_connect(enum trivalue reuse_previous_specification, if (host && strcmp(host, PQhost(o_conn)) == 0) { /* - * if we are targetting the same host, reuse its hostaddr for + * if we are targeting the same host, reuse its hostaddr for * consistency */ hostaddr = PQhostaddr(o_conn); diff --git a/src/common/unicode/generate-norm_test_table.pl b/src/common/unicode/generate-norm_test_table.pl index bb19786f0c..3ff5ee3c5e 100644 --- a/src/common/unicode/generate-norm_test_table.pl +++ b/src/common/unicode/generate-norm_test_table.pl @@ -56,7 +56,7 @@ HEADER print $OUTPUT "static const pg_unicode_test UnicodeNormalizationTests[] =\n{\n"; -# Helper routine to conver a space-separated list of Unicode characters to +# Helper routine to convert a space-separated list of Unicode characters to # hexadecimal list format, suitable for outputting in a C array. sub codepoint_string_to_hex { diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h index 6eaa678a1e..d912280386 100644 --- a/src/include/executor/tuptable.h +++ b/src/include/executor/tuptable.h @@ -200,7 +200,7 @@ struct TupleTableSlotOps * copy needs to be palloc'd in the current memory context. The slot * itself is expected to remain unaffected. It is *not* expected to have * meaningful "system columns" in the copy. The copy is not be "owned" by - * the slot i.e. the caller has to take responsibilty to free memory + * the slot i.e. the caller has to take responsibility to free memory * consumed by the slot. */ HeapTuple (*copy_heap_tuple) (TupleTableSlot *slot); @@ -210,7 +210,7 @@ struct TupleTableSlotOps * The copy needs to be palloc'd in the current memory context. The slot * itself is expected to remain unaffected. It is *not* expected to have * meaningful "system columns" in the copy. The copy is not be "owned" by - * the slot i.e. the caller has to take responsibilty to free memory + * the slot i.e. the caller has to take responsibility to free memory * consumed by the slot. */ MinimalTuple (*copy_minimal_tuple) (TupleTableSlot *slot); diff --git a/src/include/fe_utils/conditional.h b/src/include/fe_utils/conditional.h index 539b929b6a..7faa74e7be 100644 --- a/src/include/fe_utils/conditional.h +++ b/src/include/fe_utils/conditional.h @@ -5,8 +5,8 @@ * allow a manage nested conditionals. * * It is used by: - * - "psql" interpretor for handling \if ... \endif - * - "pgbench" interpretor for handling \if ... \endif + * - "psql" interpreter for handling \if ... \endif + * - "pgbench" interpreter for handling \if ... \endif * - "pgbench" syntax checker to test for proper nesting * * The stack holds the state of enclosing conditionals (are we in diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 64122bc1e3..112a9a5368 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -134,7 +134,7 @@ typedef struct ExprState * ExclusionOps Per-column exclusion operators, or NULL if none * ExclusionProcs Underlying function OIDs for ExclusionOps * ExclusionStrats Opclass strategy numbers for ExclusionOps - * UniqueOps Theses are like Exclusion*, but for unique indexes + * UniqueOps These are like Exclusion*, but for unique indexes * UniqueProcs * UniqueStrats * Unique is it a unique index? -- 2.40.0