database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Unify spelling of "canceled", "canceling", "cancellation"

Browse Source 
We had previously (af26857a27)
established the U.S. spellings as standard.
This commit is contained in:
Peter Eisentraut
2011-06-29 09:26:14 +03:00
parent 465883b0a2
commit 21f1e15aaf
30 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
doc/src/sgml/high-availability.sgml
View File

@ -1585,7 +1585,7 @@ if (!triggered)
<para>
There are also additional types of conflict that can occur with Hot Standby.
These conflicts are <emphasis>hard conflicts</> in the sense that queries
might need to be cancelled and, in some cases, sessions disconnected to resolve them.
might need to be canceled and, in some cases, sessions disconnected to resolve them.
The user is provided with several ways to handle these
conflicts. Conflict cases include:
@ -1682,7 +1682,7 @@ if (!triggered)
<para>
Once the delay specified by <varname>max_standby_archive_delay</> or
<varname>max_standby_streaming_delay</> has been exceeded, conflicting
queries will be cancelled. This usually results just in a cancellation
queries will be canceled. This usually results just in a cancellation
error, although in the case of replaying a <command>DROP DATABASE</>
the entire conflicting session will be terminated. Also, if the conflict
is over a lock held by an idle transaction, the conflicting session is
@ -1690,10 +1690,10 @@ if (!triggered)
</para>
<para>
Cancelled queries may be retried immediately (after beginning a new
Canceled queries may be retried immediately (after beginning a new
transaction, of course). Since query cancellation depends on
the nature of the WAL records being replayed, a query that was
cancelled may well succeed if it is executed again.
canceled may well succeed if it is executed again.
</para>
<para>
@ -1751,7 +1751,7 @@ if (!triggered)
Another option is to increase <xref linkend="guc-vacuum-defer-cleanup-age">
on the primary server, so that dead rows will not be cleaned up as quickly
as they normally would be. This will allow more time for queries to
execute before they are cancelled on the standby, without having to set
execute before they are canceled on the standby, without having to set
a high <varname>max_standby_streaming_delay</>. However it is
difficult to guarantee any specific execution-time window with this
approach, since <varname>vacuum_defer_cleanup_age</> is measured in
@ -1981,7 +1981,7 @@ LOG: database system is ready to accept read only connections
<command>DROP TABLESPACE</> can only succeed if the tablespace is empty.
Some standby users may be actively using the tablespace via their
<varname>temp_tablespaces</> parameter. If there are temporary files in the
tablespace, all active queries are cancelled to ensure that temporary
tablespace, all active queries are canceled to ensure that temporary
files are removed, so the tablespace can be removed and WAL replay
can continue.
</para>

2
doc/src/sgml/indexam.sgml
View File

@ -712,7 +712,7 @@ amrestrpos (IndexScanDesc scan);
read-write conflict with the insert of any tuple into that index by a
concurrent serializable transaction. If certain patterns of read-write
conflicts are detected among a set of concurrent serializable
transactions, one of those transactions may be cancelled to protect data
transactions, one of those transactions may be canceled to protect data
integrity. When the flag is set, it indicates that the index access
method implements finer-grained predicate locking, which will tend to
reduce the frequency of such transaction cancellations.

2
doc/src/sgml/libpq.sgml
View File

@ -4088,7 +4088,7 @@ int PQflush(PGconn *conn);
</sect1>
<sect1 id="libpq-cancel">
<title>Cancelling Queries in Progress</title>
<title>Canceling Queries in Progress</title>
<indexterm zone="libpq-cancel">
<primary>canceling</primary>

14
doc/src/sgml/monitoring.sgml
View File

@ -282,7 +282,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
total disk blocks read, total buffer hits (i.e., block
read requests avoided by finding the block already in buffer cache),
number of rows returned, fetched, inserted, updated and deleted, the
total number of queries cancelled due to conflict with recovery (on
total number of queries canceled due to conflict with recovery (on
standby servers), and time of last statistics reset.
</entry>
</row>
@ -290,7 +290,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
<row>
<entry><structname>pg_stat_database_conflicts</><indexterm><primary>pg_stat_database_conflicts</primary></indexterm></entry>
<entry>One row per database, showing database OID, database name and
the number of queries that have been cancelled in this database due to
the number of queries that have been canceled in this database due to
dropped tablespaces, lock timeouts, old snapshots, pinned buffers and
deadlocks. Will only contain information on standby servers, since
conflicts do not occur on master servers.
@ -639,7 +639,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
<entry><literal><function>pg_stat_get_db_conflict_tablespace</function>(<type>oid</type>)</literal></entry>
<entry><type>bigint</type></entry>
<entry>
Number of queries cancelled because of recovery conflict with dropped tablespaces in database
Number of queries canceled because of recovery conflict with dropped tablespaces in database
</entry>
</row>
@ -647,7 +647,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
<entry><literal><function>pg_stat_get_db_conflict_lock</function>(<type>oid</type>)</literal></entry>
<entry><type>bigint</type></entry>
<entry>
Number of queries cancelled because of recovery conflict with locks in database
Number of queries canceled because of recovery conflict with locks in database
</entry>
</row>
@ -655,7 +655,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
<entry><literal><function>pg_stat_get_db_conflict_snapshot</function>(<type>oid</type>)</literal></entry>
<entry><type>bigint</type></entry>
<entry>
Number of queries cancelled because of recovery conflict with old snapshots in database
Number of queries canceled because of recovery conflict with old snapshots in database
</entry>
</row>
@ -663,7 +663,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
<entry><literal><function>pg_stat_get_db_conflict_bufferpin</function>(<type>oid</type>)</literal></entry>
<entry><type>bigint</type></entry>
<entry>
Number of queries cancelled because of recovery conflict with pinned buffers in database
Number of queries canceled because of recovery conflict with pinned buffers in database
</entry>
</row>
@ -671,7 +671,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
<entry><literal><function>pg_stat_get_db_conflict_startup_deadlock</function>(<type>oid</type>)</literal></entry>
<entry><type>bigint</type></entry>
<entry>
Number of queries cancelled because of recovery conflict with deadlocks in database
Number of queries canceled because of recovery conflict with deadlocks in database
</entry>
</row>

2
doc/src/sgml/protocol.sgml
View File

@ -1142,7 +1142,7 @@
</sect2>
<sect2>
<title>Cancelling Requests in Progress</title>
<title>Canceling Requests in Progress</title>
<para>
During the processing of a query, the frontend might request

2
doc/src/sgml/ref/set_transaction.sgml
View File

@ -143,7 +143,7 @@ SET SESSION CHARACTERISTICS AS TRANSACTION <replaceable class="parameter">transa
transaction, the transaction may block when first acquiring its snapshot,
after which it is able to run without the normal overhead of a
<literal>SERIALIZABLE</literal> transaction and without any risk of
contributing to or being cancelled by a serialization failure. This mode
contributing to or being canceled by a serialization failure. This mode
is well suited for long-running reports or backups.
</para>
</refsect1>

2
doc/src/sgml/release-7.4.sgml
View File

@ -465,7 +465,7 @@
</para>
<para>
This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
after it's already committed its tuple movements, as well as transient
errors if a plain <literal>VACUUM</> is interrupted after having
truncated the table.

2
doc/src/sgml/release-8.0.sgml
View File

@ -609,7 +609,7 @@
</para>
<para>
This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
after it's already committed its tuple movements, as well as transient
errors if a plain <literal>VACUUM</> is interrupted after having
truncated the table.

4
doc/src/sgml/release-8.1.sgml
View File

@ -849,7 +849,7 @@
</para>
<para>
This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
after it's already committed its tuple movements, as well as transient
errors if a plain <literal>VACUUM</> is interrupted after having
truncated the table.
@ -4203,7 +4203,7 @@ psql -t -f fixseq.sql db1 | psql -e db1
<para>
While the <varname>statement_timeout</> configuration
parameter allows a query taking more than a certain amount of
time to be cancelled, the <command>NOWAIT</> option allows a
time to be canceled, the <command>NOWAIT</> option allows a
query to be canceled as soon as a <command>SELECT ... FOR
UPDATE/SHARE</> command cannot immediately acquire a row lock.
</para>

2
doc/src/sgml/release-8.2.sgml
View File

@ -1334,7 +1334,7 @@
</para>
<para>
This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
after it's already committed its tuple movements, as well as transient
errors if a plain <literal>VACUUM</> is interrupted after having
truncated the table.

2
doc/src/sgml/release-8.3.sgml
View File

@ -1566,7 +1566,7 @@
</para>
<para>
This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
after it's already committed its tuple movements, as well as transient
errors if a plain <literal>VACUUM</> is interrupted after having
truncated the table.

2
doc/src/sgml/release-8.4.sgml
View File

@ -2062,7 +2062,7 @@
</para>
<para>
This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
after it's already committed its tuple movements, as well as transient
errors if a plain <literal>VACUUM</> is interrupted after having
truncated the table.

2
doc/src/sgml/release-9.1.sgml
View File

@ -779,7 +779,7 @@
</para>
<para>
This helps avoid cancelling long-running queries on the standby.
This helps avoid canceling long-running queries on the standby.
</para>
</listitem>