Commit acd58030 authored by Peter Eisentraut's avatar Peter Eisentraut

Standardize spelling of "nonblocking"

Only adjusted the user-exposed messages and documentation,  not all
source code comments.
parent 52869630
...@@ -746,7 +746,7 @@ amrestrpos (IndexScanDesc scan); ...@@ -746,7 +746,7 @@ amrestrpos (IndexScanDesc scan);
<para> <para>
When the <structfield>ampredlocks</> flag is not set, any scan using that When the <structfield>ampredlocks</> flag is not set, any scan using that
index access method within a serializable transaction will acquire a index access method within a serializable transaction will acquire a
non-blocking predicate lock on the full index. This will generate a nonblocking predicate lock on the full index. This will generate a
read-write conflict with the insert of any tuple into that index by a read-write conflict with the insert of any tuple into that index by a
concurrent serializable transaction. If certain patterns of read-write concurrent serializable transaction. If certain patterns of read-write
conflicts are detected among a set of concurrent serializable conflicts are detected among a set of concurrent serializable
......
...@@ -1366,7 +1366,7 @@ SELECT pg_advisory_lock(q.id) FROM ...@@ -1366,7 +1366,7 @@ SELECT pg_advisory_lock(q.id) FROM
<para> <para>
As mentioned in <xref linkend="xact-serializable">, Serializable As mentioned in <xref linkend="xact-serializable">, Serializable
transactions are just Repeatable Read transactions which add transactions are just Repeatable Read transactions which add
non-blocking monitoring for dangerous patterns of read/write conflicts. nonblocking monitoring for dangerous patterns of read/write conflicts.
When a pattern is detected which could cause a cycle in the apparent When a pattern is detected which could cause a cycle in the apparent
order of execution, one of the transactions involved is rolled back to order of execution, one of the transactions involved is rolled back to
break the cycle. break the cycle.
......
...@@ -808,7 +808,7 @@ pq_set_nonblocking(bool nonblocking) ...@@ -808,7 +808,7 @@ pq_set_nonblocking(bool nonblocking)
{ {
if (!pg_set_noblock(MyProcPort->sock)) if (!pg_set_noblock(MyProcPort->sock))
ereport(COMMERROR, ereport(COMMERROR,
(errmsg("could not set socket to non-blocking mode: %m"))); (errmsg("could not set socket to nonblocking mode: %m")));
} }
else else
{ {
......
...@@ -6261,7 +6261,7 @@ InitPostmasterDeathWatchHandle(void) ...@@ -6261,7 +6261,7 @@ InitPostmasterDeathWatchHandle(void)
if (fcntl(postmaster_alive_fds[POSTMASTER_FD_WATCH], F_SETFL, O_NONBLOCK)) if (fcntl(postmaster_alive_fds[POSTMASTER_FD_WATCH], F_SETFL, O_NONBLOCK))
ereport(FATAL, ereport(FATAL,
(errcode_for_socket_access(), (errcode_for_socket_access(),
errmsg_internal("could not set postmaster death monitoring pipe to non-blocking mode: %m"))); errmsg_internal("could not set postmaster death monitoring pipe to nonblocking mode: %m")));
#else #else
/* /*
......
...@@ -285,7 +285,7 @@ pg_krb5_sendauth(PGconn *conn) ...@@ -285,7 +285,7 @@ pg_krb5_sendauth(PGconn *conn)
char sebuf[256]; char sebuf[256];
printfPQExpBuffer(&conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
libpq_gettext("could not restore non-blocking mode on socket: %s\n"), libpq_gettext("could not restore nonblocking mode on socket: %s\n"),
pqStrerror(errno, sebuf, sizeof(sebuf))); pqStrerror(errno, sebuf, sizeof(sebuf)));
ret = STATUS_ERROR; ret = STATUS_ERROR;
} }
......
...@@ -1666,7 +1666,7 @@ keep_going: /* We will come back to here until there is ...@@ -1666,7 +1666,7 @@ keep_going: /* We will come back to here until there is
if (!pg_set_noblock(conn->sock)) if (!pg_set_noblock(conn->sock))
{ {
appendPQExpBuffer(&conn->errorMessage, appendPQExpBuffer(&conn->errorMessage,
libpq_gettext("could not set socket to non-blocking mode: %s\n"), libpq_gettext("could not set socket to nonblocking mode: %s\n"),
SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf))); SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
pqDropConnection(conn); pqDropConnection(conn);
conn->addr_cur = addr_cur->ai_next; conn->addr_cur = addr_cur->ai_next;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment