Movatterモバイル変換

Skip to content

postgrespro/postgresPublic

forked frompostgres/postgres

NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit8c9da14

alvherre

committed

Make spelling of cancelled/cancellation consistent

This fixes places where words derived from cancel were not using theircommon en-US ugly^H^H^H^Hspelling.Author: Jelte Fennema-Nio <postgres@jeltef.nl>Reported-by: Thomas Munro <thomas.munro@gmail.com>Discussion:https://postgr.es/m/CA+hUKG+Lrq+ty6yWXF5572qNQ8KwxGwG5n4fsEcCUap685nWvQ@mail.gmail.com

1 parent64444ce commit8c9da14Copy full SHA for 8c9da14

File tree

5 files changed

+5

-5

lines changed

doc/src/sgml
- event-trigger.sgml
- libpq.sgml
src
- backend/storage/lmgr
  - proc.c
- test
  - isolation/specs
    - detach-partition-concurrently-4.spec
  - recovery/t
    - 001_stream_rep.pl

5 files changed

+5

-5

lines changed

`‎doc/src/sgml/event-trigger.sgml`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`writing anything to the database when running on a standby.`
`51`	`51`	`Also, it's recommended to avoid long-running queries in`
`52`	`52`	`<literal>login</literal> event triggers. Notes that, for instance,`
`53`		`-cancelling connection in <application>psql</application> wouldn't cancel`
	`53`	`+canceling connection in <application>psql</application> wouldn't cancel`
`54`	`54`	`the in-progress <literal>login</literal> trigger.`
`55`	`55`	`</para>`
`56`	`56`

`‎doc/src/sgml/libpq.sgml`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7625,7 +7625,7 @@ defaultNoticeProcessor(void arg, const char message)`
`7625`	`7625`	`is called. It is the ideal time to initialize any`
`7626`	`7626`	`<literal>instanceData</literal> an event procedure may need. Only one`
`7627`	`7627`	`register event will be fired per event handler per connection. If the`
`7628`		`- event procedure fails (returns zero), the registration iscancelled.`
	`7628`	`+ event procedure fails (returns zero), the registration iscanceled.`
`7629`	`7629`
`7630`	`7630`	`<synopsis>`
`7631`	`7631`	`typedef struct`

`‎src/backend/storage/lmgr/proc.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1353,7 +1353,7 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable)`
`1353`	`1353`	`* coding means that there is a tiny chance that the process`
`1354`	`1354`	`* terminates its current transaction and starts a different one`
`1355`	`1355`	`* before we have a change to send the signal; the worst possible`
`1356`		`- * consequence is that a for-wraparound vacuum iscancelled. But`
	`1356`	`+ * consequence is that a for-wraparound vacuum iscanceled. But`
`1357`	`1357`	`* that could happen in any case unless we were to do kill() with`
`1358`	`1358`	`* the lock held, which is much more undesirable.`
`1359`	`1359`	`*/`

`‎src/test/isolation/specs/detach-partition-concurrently-4.spec`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# This test exercises behavior of foreign keys in the face of concurrent`
`2`	`2`	`# detach of partitions in the referenced table.`
`3`		`-# (The cases where the detaching transaction iscancelled is interesting`
	`3`	`+# (The cases where the detaching transaction iscanceled is interesting`
`4`	`4`	`# because the locking situation is completely different. I didn't verify`
`5`	`5`	`# that keeping both variants adds any extra coverage.)`
`6`	`6`	`#`

`‎src/test/recovery/t/001_stream_rep.pl`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,7 @@ sub replay_check`
`601`	`601`	`ok( pump_until(`
`602`	`602`	`$sigchld_bb,$sigchld_bb_timeout,`
`603`	`603`	`\$sigchld_bb_stderr,qr/backup is not in progress/),`
`604`		`-'base backup cleanlycancelled');`
	`604`	`+'base backup cleanlycanceled');`
`605`	`605`	`$sigchld_bb->finish();`
`606`	`606`
`607`	`607`	`done_testing();`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp