diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml
index 48d462ab29..b8fb1c4611 100644
--- a/doc/src/sgml/ref/lock.sgml
+++ b/doc/src/sgml/ref/lock.sgml
@@ -53,13 +53,13 @@ LOCK [ TABLE ] table IN SHARE ROW E
This lock mode is acquired automatically over tables being queried.
Postgres releases automatically acquired
- ACCESS SHARE locks after statement is done.
+ ACCESS SHARE locks after the statement is done.
-
- This is the less restrictive lock mode which conflicts with
- ACCESS EXCLUSIVE mode only. It's intended to protect table being
+
+ This is the least restrictive lock mode which conflicts only with
+ ACCESS EXCLUSIVE mode. It is intended to protect a table being
queried from concurrent ALTER TABLE,
DROP TABLE and VACUUM
statements over the same table.
@@ -74,12 +74,12 @@ LOCK [ TABLE ] table IN SHARE ROW E
- Automatically acquired by SELECT FOR UPDATE statement.
-
+ Automatically acquired by any SELECT FOR UPDATE statement.
+
-
- Conflicts with EXCLUSIVE and ACCESS EXCLUSIVE lock modes.
+
+ Conflicts with EXCLUSIVE and ACCESS EXCLUSIVE lock modes.
@@ -91,15 +91,15 @@ LOCK [ TABLE ] table IN SHARE ROW E
- Automatically acquired by UPDATE,
- DELETE, INSERT statements.
-
-
+ Automatically acquired by any UPDATE,
+ DELETE, INSERT statement.
+
+
-
+
Conflicts with SHARE, SHARE ROW EXCLUSIVE, EXCLUSIVE and
ACCESS EXCLUSIVE modes. Generally means that a transaction
- updated/inserted some tuples in a table.
+ updated or inserted some tuples in a table.
@@ -111,14 +111,14 @@ LOCK [ TABLE ] table IN SHARE ROW E
- Automatically acquired by CREATE INDEX statement.
+ Automatically acquired by any CREATE INDEX statement.
-
- Conflicts with ROW EXCLUSIVE, SHARE ROW EXCLUSIVE, EXCLUSIVE and
- ACCESS EXCLUSIVE modes. This mode protects a table against
- concurrent updates.
+
+ Conflicts with ROW EXCLUSIVE, SHARE ROW EXCLUSIVE, EXCLUSIVE and
+ ACCESS EXCLUSIVE modes. This mode protects a table against
+ concurrent updates.
@@ -129,7 +129,7 @@ LOCK [ TABLE ] table IN SHARE ROW E
-
+
Conflicts with ROW EXCLUSIVE, SHARE, SHARE ROW EXCLUSIVE,
EXCLUSIVE and ACCESS EXCLUSIVE modes. This mode is more
restrictive than SHARE mode because of only one transaction
@@ -144,10 +144,10 @@ LOCK [ TABLE ] table IN SHARE ROW E
-
+
Conflicts with ROW SHARE, ROW EXCLUSIVE, SHARE, SHARE ROW EXCLUSIVE,
EXCLUSIVE and ACCESS EXCLUSIVE modes. This mode is yet more
- restrictive than SHARE ROW EXCLUSIVE one - it blocks concurrent
+ restrictive than that of SHARE ROW EXCLUSIVE; it blocks all concurrent
SELECT FOR UPDATE queries.
@@ -159,24 +159,24 @@ LOCK [ TABLE ] table IN SHARE ROW E
-
- Automatically acquired by ALTER TABLE,
- DROP TABLE, VACUUM statements.
-
-
+
+ Automatically acquired by ALTER TABLE,
+ DROP TABLE, VACUUM statements.
+
+
-
+
This is the most restrictive lock mode which conflicts with all other
- lock modes and protects locked table from any concurrent operations.
-
+ lock modes and protects a locked table from any concurrent operations.
+
-
-
- This lock mode is also acquired by first form of
- LOCK TABLE (i.e. without explicit
- lock mode option).
-
-
+
+
+ This lock mode is also acquired by an unqualified
+ LOCK TABLE (i.e. the command without an explicit
+ lock mode option).
+
+
@@ -218,92 +218,104 @@ LOCK [ TABLE ] table IN SHARE ROW E
Description
- Postgres always uses less restrictive
- lock modes ever possible. LOCK TABLE statement
- provided for cases when you might need in more restrictive locking.
+ Postgres always uses the least restrictive
+ lock mode whenever possible. LOCK TABLE
+ provided for cases when you might need more restrictive locking.
- For example, application run transaction at READ COMMITTED isolation
- level and need to ensure existance data in a table for duration of
- transaction. To achieve this you could use SHARE lock mode over
+ For example, an application runs a transaction at READ COMMITTED isolation
+ level and needs to ensure the existance of data in a table for the
+ duration of the
+ transaction. To achieve this you could use SHARE lock mode over the
table before querying. This will protect data from concurrent changes
- and provide your further read operations over table with data in their
- real current state, because of SHARE lock mode conflicts with ROW EXCLUSIVE
- one, acquired by writers, and your LOCK TABLE table IN SHARE MODE statement
- will wait untill concurrent write operations (if any) commit/rollback.
- (Note that to read data in their real current state running transaction
- at SERIALIZABLE isolation level you have to execute LOCK TABLE
- statement before execution any DML statement, when transaction defines
- what concurrent changes will be visible to herself).
+ and provide any further read operations over the table with data in their
+ actual current state, because SHARE lock mode conflicts with any ROW EXCLUSIVE
+ one acquired by writers, and your LOCK TABLE table IN SHARE MODE statement
+ will wait until any concurrent write operations commit or rollback.
+
+
+
+ To read data in their real current state when running a transaction
+ at the SERIALIZABLE isolation level you have to execute a LOCK TABLE
+ statement before execution any DML statement, when the transaction defines
+ what concurrent changes will be visible to itself.
+
+
- If, in addition to requirements above, transaction is going to
+ In addition to the requirements above, if a transaction is going to
change data in a table then SHARE ROW EXCLUSIVE lock mode should
be acquired to prevent deadlock conditions when two concurrent
- transactions would lock table in SHARE mode and than would
+ transactions attempt to lock the table in SHARE mode and then
try to change data in this table, both (implicitly) acquiring
ROW EXCLUSIVE lock mode that conflicts with concurrent SHARE lock.
- Following deadlock issue (when two transaction wait one another)
- touched above, you should follow two general rules to prevent
+ To continue with the deadlock (when two transaction wait one another)
+ issue raised above, you should follow two general rules to prevent
deadlock conditions:
-
-
-
- Transactions have to acquire locks on the same objects in the same order.
-
-
-
- For example, if one application updates row R1 and than updates
- row R2 (in the same transaction) then second application shouldn't
- update row R2 if it's going update row R1 later (in single transaction).
- Instead, it should update R1 and R2 rows in the same order as first
- application.
-
-
-
-
- Transactions should acquire two conflicting lock modes only if
- one of them is self-conflicting (i.e. may be held by one
- transaction at time only) and should acquire most restrictive
- mode first.
-
+
+
+
+ Transactions have to acquire locks on the same objects in the same order.
+
-
- Example for this rule is described above when told about using
- SHARE ROW EXCLUSIVE mode instead of SHARE one.
-
-
+
+ For example, if one application updates row R1 and than updates
+ row R2 (in the same transaction) then the second application shouldn't
+ update row R2 if it's going to update row R1 later (in a single transaction).
+ Instead, it should update rows R1 and R2 in the same order as the first
+ application.
+
+
+
+
+
+ Transactions should acquire two conflicting lock modes only if
+ one of them is self-conflicting (i.e. may be held by one
+ transaction at time only). If multiple lock modes are involved,
+ then transactions should always acquire the most restrictive mode first.
+
+
+
+ An example for this rule was given previously when discussing the
+ use of SHARE ROW EXCLUSIVE mode rather than SHARE mode.
+
+
+
Postgres does detect deadlocks and will
- rollback one of waiting transactions to resolve the deadlock.
+ rollback at least one waiting transaction to resolve the deadlock.
- 1998-09-24
+ 1999-06-08
Notes
+
LOCK is a Postgres
language extension.
+
Except for ACCESS SHARE/EXCLUSIVE lock modes, all other
- Postgres lock modes and
- LOCK TABLE syntax are compatible with
- Oracle ones.
+ Postgres lock modes and the
+ LOCK TABLE syntax are compatible with those
+ present in Oracle.
+
+
LOCK works only inside transactions.
@@ -329,7 +341,7 @@ LOCK [ TABLE ] table IN SHARE ROW E
-- Do ROLLBACK if record was not returned
--
INSERT INTO films_user_comments VALUES
- (_id_, 'GREAT! I was waiting it so long!');
+ (_id_, 'GREAT! I was waiting for it for so long!');
COMMIT WORK;
@@ -366,7 +378,8 @@ LOCK [ TABLE ] table IN SHARE ROW E
There is no LOCK TABLE in SQL92,
which instead uses SET TRANSACTION to specify
- concurrency level on transactions. We support that too.
+ concurrency level on transactions. We support that too; see
+ for details.
diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
index 3014bbda50..f7850a839f 100644
--- a/doc/src/sgml/ref/set.sgml
+++ b/doc/src/sgml/ref/set.sgml
@@ -6,7 +6,7 @@
SQL - Language Statements
-
+
SET