diff options
author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2018-07-09 16:10:44 +0300 |
---|---|---|
committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2018-07-18 16:54:54 +0300 |
commit | a9793e07351eb47c926a9e885956bf2d10da66dd (patch) | |
tree | 14f54a2fabe198e046b267736f28aa88d9bb6a70 /src | |
parent | ac6b69c1959fee3d6c987229edad62185db70c8c (diff) |
Fix misc typos, mostly in comments.
A collection of typos I happened to spot while reading code, as well as
grepping for common mistakes.
Backpatch to all supported versions, as applicable, to avoid conflicts
when backporting other commits in the future.
Diffstat (limited to 'src')
-rw-r--r-- | src/backend/access/transam/multixact.c | 4 | ||||
-rw-r--r-- | src/backend/commands/cluster.c | 2 | ||||
-rw-r--r-- | src/backend/executor/nodeModifyTable.c | 2 | ||||
-rw-r--r-- | src/backend/replication/logical/origin.c | 2 | ||||
-rw-r--r-- | src/bin/initdb/t/001_initdb.pl | 2 | ||||
-rw-r--r-- | src/bin/pg_upgrade/tablespace.c | 2 | ||||
-rw-r--r-- | src/interfaces/ecpg/ecpglib/execute.c | 4 | ||||
-rw-r--r-- | src/pl/tcl/pltcl.c | 2 | ||||
-rw-r--r-- | src/test/regress/expected/rowsecurity.out | 2 | ||||
-rw-r--r-- | src/test/regress/expected/rules.out | 2 | ||||
-rw-r--r-- | src/test/regress/sql/rowsecurity.sql | 2 | ||||
-rw-r--r-- | src/test/regress/sql/rules.sql | 2 |
12 files changed, 14 insertions, 14 deletions
diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c index fdf8e0c33a4..12937c510b8 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -2555,7 +2555,7 @@ SetOffsetVacuumLimit(void) /* * NB: Have to prevent concurrent truncation, we might otherwise try to - * lookup a oldestMulti that's concurrently getting truncated away. + * lookup an oldestMulti that's concurrently getting truncated away. */ LWLockAcquire(MultiXactTruncationLock, LW_SHARED); @@ -2731,7 +2731,7 @@ find_multixact_start(MultiXactId multi, MultiXactOffset *result) /* * Flush out dirty data, so PhysicalPageExists can work correctly. * SimpleLruFlush() is a pretty big hammer for that. Alternatively we - * could add a in-memory version of page exists, but find_multixact_start + * could add an in-memory version of page exists, but find_multixact_start * is called infrequently, and it doesn't seem bad to flush buffers to * disk before truncation. */ diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 9e39e2f648c..9c91f2c31f7 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -1542,7 +1542,7 @@ finish_heap_swap(Oid OIDOldHeap, Oid OIDNewHeap, * swap_relation_files()), thus relfrozenxid was not updated. That's * annoying because a potential reason for doing a VACUUM FULL is a * imminent or actual anti-wraparound shutdown. So, now that we can - * access the new relation using it's indices, update relfrozenxid. + * access the new relation using its indices, update relfrozenxid. * pg_class doesn't have a toast relation, so we don't need to update the * corresponding toast relation. Not that there's little point moving all * relfrozenxid updates here since swap_relation_files() needs to write to diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c index ae2a147c62f..252324910ea 100644 --- a/src/backend/executor/nodeModifyTable.c +++ b/src/backend/executor/nodeModifyTable.c @@ -1053,7 +1053,7 @@ lreplace:; * (but still lock row, even though it may not satisfy estate's * snapshot). * - * Returns true if if we're done (with or without an update), or false if + * Returns true if we're done (with or without an update), or false if * the caller must retry the INSERT from scratch. */ static bool diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c index 6fccdd86544..4ecd6a9eae0 100644 --- a/src/backend/replication/logical/origin.c +++ b/src/backend/replication/logical/origin.c @@ -1404,7 +1404,7 @@ pg_show_replication_origin_status(PG_FUNCTION_ARGS) int i; #define REPLICATION_ORIGIN_PROGRESS_COLS 4 - /* we we want to return 0 rows if slot is set to zero */ + /* we want to return 0 rows if slot is set to zero */ replorigin_check_prerequisites(false, true); if (rsinfo == NULL || !IsA(rsinfo, ReturnSetInfo)) diff --git a/src/bin/initdb/t/001_initdb.pl b/src/bin/initdb/t/001_initdb.pl index 299dcf5b3b9..c4e514c7fbf 100644 --- a/src/bin/initdb/t/001_initdb.pl +++ b/src/bin/initdb/t/001_initdb.pl @@ -1,4 +1,4 @@ -# To test successful data directory creation with a additional feature, first +# To test successful data directory creation with an additional feature, first # try to elaborate the "successful creation" test instead of adding a test. # Successful initdb consumes much time and I/O. diff --git a/src/bin/pg_upgrade/tablespace.c b/src/bin/pg_upgrade/tablespace.c index a20cbc60a4a..0122cf911c0 100644 --- a/src/bin/pg_upgrade/tablespace.c +++ b/src/bin/pg_upgrade/tablespace.c @@ -36,7 +36,7 @@ init_tablespaces(void) * get_tablespace_paths() * * Scans pg_tablespace and returns a malloc'ed array of all tablespace - * paths. Its the caller's responsibility to free the array. + * paths. It's the caller's responsibility to free the array. */ static void get_tablespace_paths(void) diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c index f74ed5e8002..5b09233810d 100644 --- a/src/interfaces/ecpg/ecpglib/execute.c +++ b/src/interfaces/ecpg/ecpglib/execute.c @@ -1310,8 +1310,8 @@ ecpg_build_params(struct statement * stmt) if ((position = next_insert(stmt->command, position, stmt->questionmarks, std_strings) + 1) == 0) { /* - * We have an argument but we dont have the matched up placeholder - * in the string + * We have an argument but we don't have the matched up + * placeholder in the string */ ecpg_raise(stmt->lineno, ECPG_TOO_MANY_ARGUMENTS, ECPG_SQLSTATE_USING_CLAUSE_DOES_NOT_MATCH_PARAMETERS, diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c index 92098570a66..5dfbc6a3721 100644 --- a/src/pl/tcl/pltcl.c +++ b/src/pl/tcl/pltcl.c @@ -2354,7 +2354,7 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp, } /************************************************************ - * If there was a argtype list on preparation, we need + * If there was an argtype list on preparation, we need * an argument value list now ************************************************************/ if (qdesc->nargs > 0) diff --git a/src/test/regress/expected/rowsecurity.out b/src/test/regress/expected/rowsecurity.out index c9a0abc7e71..91ad2f2f87d 100644 --- a/src/test/regress/expected/rowsecurity.out +++ b/src/test/regress/expected/rowsecurity.out @@ -1614,7 +1614,7 @@ SET SESSION AUTHORIZATION rls_regress_user1; INSERT INTO document VALUES (79, (SELECT cid from category WHERE cname = 'technology'), 1, 'rls_regress_user1', 'technology book, can only insert') ON CONFLICT (did) DO UPDATE SET dtitle = EXCLUDED.dtitle RETURNING *; ERROR: new row violates row-level security policy for table "document" --- UPDATE path is taken here. Existing tuple passes, since it's cid +-- UPDATE path is taken here. Existing tuple passes, since its cid -- corresponds to "novel", but default USING qual is enforced against -- post-UPDATE tuple too (as always when updating with a policy that lacks an -- explicit WCO), and so this fails: diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out index 63094c03b99..fa2f525e4d0 100644 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@ -2685,7 +2685,7 @@ Rules: NOTIFY rules_src_deletion -- --- Ensure a aliased target relation for insert is correctly deparsed. +-- Ensure an aliased target relation for insert is correctly deparsed. -- create rule r4 as on insert to rules_src do instead insert into rules_log AS trgt SELECT NEW.* RETURNING trgt.f1, trgt.f2; create rule r5 as on update to rules_src do instead UPDATE rules_log AS trgt SET tag = 'updated' WHERE trgt.f1 = new.f1; diff --git a/src/test/regress/sql/rowsecurity.sql b/src/test/regress/sql/rowsecurity.sql index b836ca99922..8e14cc0dca7 100644 --- a/src/test/regress/sql/rowsecurity.sql +++ b/src/test/regress/sql/rowsecurity.sql @@ -593,7 +593,7 @@ SET SESSION AUTHORIZATION rls_regress_user1; INSERT INTO document VALUES (79, (SELECT cid from category WHERE cname = 'technology'), 1, 'rls_regress_user1', 'technology book, can only insert') ON CONFLICT (did) DO UPDATE SET dtitle = EXCLUDED.dtitle RETURNING *; --- UPDATE path is taken here. Existing tuple passes, since it's cid +-- UPDATE path is taken here. Existing tuple passes, since its cid -- corresponds to "novel", but default USING qual is enforced against -- post-UPDATE tuple too (as always when updating with a policy that lacks an -- explicit WCO), and so this fails: diff --git a/src/test/regress/sql/rules.sql b/src/test/regress/sql/rules.sql index 1d43c8b2058..8f628c2e836 100644 --- a/src/test/regress/sql/rules.sql +++ b/src/test/regress/sql/rules.sql @@ -997,7 +997,7 @@ create rule r3 as on delete to rules_src do notify rules_src_deletion; \d+ rules_src -- --- Ensure a aliased target relation for insert is correctly deparsed. +-- Ensure an aliased target relation for insert is correctly deparsed. -- create rule r4 as on insert to rules_src do instead insert into rules_log AS trgt SELECT NEW.* RETURNING trgt.f1, trgt.f2; create rule r5 as on update to rules_src do instead UPDATE rules_log AS trgt SET tag = 'updated' WHERE trgt.f1 = new.f1; |