1
0
mirror of https://github.com/postgres/postgres.git synced 2025-05-02 11:44:50 +03:00

Accept relations of any kind in LOCK TABLE

The restriction that only tables and views can be locked by LOCK TABLE
is quite arbitrary, since the underlying mechanism can lock any relation
type.  Drop the restriction so that programs such as pg_dump can lock
all relations they're interested in, preventing schema changes that
could cause a dump to fail after expending much effort.

Backpatch to 9.5.

Author: Álvaro Herrera <alvherre@alvh.no-ip.org>
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Reported-by: Wells Oliver <wells.oliver@gmail.com>
Discussion: https://postgr.es/m/20201021200659.GA32358@alvherre.pgsql
This commit is contained in:
Alvaro Herrera 2020-10-27 13:49:19 -03:00
parent 2339038a9b
commit 2f0baa244f
No known key found for this signature in database
GPG Key ID: 1C20ACB9D5C564AE
4 changed files with 40 additions and 21 deletions

View File

@ -16,7 +16,7 @@ PostgreSQL documentation
<refnamediv> <refnamediv>
<refname>LOCK</refname> <refname>LOCK</refname>
<refpurpose>lock a table</refpurpose> <refpurpose>lock a named relation (table, etc)</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
@ -34,7 +34,9 @@ LOCK [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
<title>Description</title> <title>Description</title>
<para> <para>
<command>LOCK TABLE</command> obtains a table-level lock, waiting <command>LOCK TABLE</command> obtains a table-level lock on a
relation (table, partitioned table, foreign table, view,
materialized view, index, composite type, sequence), waiting
if necessary for any conflicting locks to be released. If if necessary for any conflicting locks to be released. If
<literal>NOWAIT</literal> is specified, <command>LOCK <literal>NOWAIT</literal> is specified, <command>LOCK
TABLE</command> does not wait to acquire the desired lock: if it TABLE</command> does not wait to acquire the desired lock: if it
@ -110,17 +112,18 @@ LOCK [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
<term><replaceable class="PARAMETER">name</replaceable></term> <term><replaceable class="PARAMETER">name</replaceable></term>
<listitem> <listitem>
<para> <para>
The name (optionally schema-qualified) of an existing table to The name (optionally schema-qualified) of an existing relation to
lock. If <literal>ONLY</> is specified before the table name, only that lock. If <literal>ONLY</literal> is specified before a table name, only that
table is locked. If <literal>ONLY</> is not specified, the table and all table is locked. If <literal>ONLY</literal> is not specified, the table and all
its descendant tables (if any) are locked. Optionally, <literal>*</> its descendant tables (if any) are locked. Optionally, <literal>*</literal>
can be specified after the table name to explicitly indicate that can be specified after the table name to explicitly indicate that
descendant tables are included. descendant tables are included. When locking a view, all relations appearing
in the view definition are locked, regardless of <literal>ONLY</literal>.
</para> </para>
<para> <para>
The command <literal>LOCK TABLE a, b;</> is equivalent to The command <literal>LOCK TABLE a, b;</literal> is equivalent to
<literal>LOCK TABLE a; LOCK TABLE b;</>. The tables are locked <literal>LOCK TABLE a; LOCK TABLE b;</literal>. The relations are locked
one-by-one in the order specified in the <command>LOCK one-by-one in the order specified in the <command>LOCK
TABLE</command> command. TABLE</command> command.
</para> </para>

View File

@ -88,13 +88,6 @@ RangeVarCallbackForLockTable(const RangeVar *rv, Oid relid, Oid oldrelid,
return; /* woops, concurrently dropped; no permissions return; /* woops, concurrently dropped; no permissions
* check */ * check */
/* Currently, we only allow plain tables to be locked */
if (relkind != RELKIND_RELATION && relkind != RELKIND_PARTITIONED_TABLE)
ereport(ERROR,
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
errmsg("\"%s\" is not a table",
rv->relname)));
/* /*
* Make note if a temporary relation has been accessed in this * Make note if a temporary relation has been accessed in this
* transaction. * transaction.

View File

@ -5,7 +5,10 @@
CREATE SCHEMA lock_schema1; CREATE SCHEMA lock_schema1;
SET search_path = lock_schema1; SET search_path = lock_schema1;
CREATE TABLE lock_tbl1 (a BIGINT); CREATE TABLE lock_tbl1 (a BIGINT);
CREATE VIEW lock_view1 AS SELECT 1; CREATE VIEW lock_view1 AS SELECT 1 AS a;
CREATE MATERIALIZED VIEW lock_mv1 AS SELECT * FROM lock_view1;
CREATE INDEX lock_mvi1 ON lock_mv1 (a);
CREATE SEQUENCE lock_seq;
CREATE ROLE regress_rol_lock1; CREATE ROLE regress_rol_lock1;
ALTER ROLE regress_rol_lock1 SET search_path = lock_schema1; ALTER ROLE regress_rol_lock1 SET search_path = lock_schema1;
GRANT USAGE ON SCHEMA lock_schema1 TO regress_rol_lock1; GRANT USAGE ON SCHEMA lock_schema1 TO regress_rol_lock1;
@ -30,8 +33,7 @@ LOCK TABLE lock_tbl1 IN SHARE MODE NOWAIT;
LOCK TABLE lock_tbl1 IN SHARE ROW EXCLUSIVE MODE NOWAIT; LOCK TABLE lock_tbl1 IN SHARE ROW EXCLUSIVE MODE NOWAIT;
LOCK TABLE lock_tbl1 IN EXCLUSIVE MODE NOWAIT; LOCK TABLE lock_tbl1 IN EXCLUSIVE MODE NOWAIT;
LOCK TABLE lock_tbl1 IN ACCESS EXCLUSIVE MODE NOWAIT; LOCK TABLE lock_tbl1 IN ACCESS EXCLUSIVE MODE NOWAIT;
LOCK TABLE lock_view1 IN EXCLUSIVE MODE; -- Will fail; can't lock a non-table LOCK TABLE lock_view1 IN EXCLUSIVE MODE;
ERROR: "lock_view1" is not a table
ROLLBACK; ROLLBACK;
-- Verify that we can lock a table with inheritance children. -- Verify that we can lock a table with inheritance children.
CREATE TABLE lock_tbl2 (b BIGINT) INHERITS (lock_tbl1); CREATE TABLE lock_tbl2 (b BIGINT) INHERITS (lock_tbl1);
@ -51,13 +53,21 @@ BEGIN;
LOCK TABLE ONLY lock_tbl1; LOCK TABLE ONLY lock_tbl1;
ROLLBACK; ROLLBACK;
RESET ROLE; RESET ROLE;
-- Lock other relations
BEGIN TRANSACTION;
LOCK TABLE lock_mv1;
LOCK TABLE lock_mvi1;
LOCK TABLE lock_seq;
ROLLBACK;
-- --
-- Clean up -- Clean up
-- --
DROP MATERIALIZED VIEW lock_mv1;
DROP VIEW lock_view1; DROP VIEW lock_view1;
DROP TABLE lock_tbl3; DROP TABLE lock_tbl3;
DROP TABLE lock_tbl2; DROP TABLE lock_tbl2;
DROP TABLE lock_tbl1; DROP TABLE lock_tbl1;
DROP SEQUENCE lock_seq;
DROP SCHEMA lock_schema1 CASCADE; DROP SCHEMA lock_schema1 CASCADE;
DROP ROLE regress_rol_lock1; DROP ROLE regress_rol_lock1;
-- atomic ops tests -- atomic ops tests

View File

@ -6,7 +6,10 @@
CREATE SCHEMA lock_schema1; CREATE SCHEMA lock_schema1;
SET search_path = lock_schema1; SET search_path = lock_schema1;
CREATE TABLE lock_tbl1 (a BIGINT); CREATE TABLE lock_tbl1 (a BIGINT);
CREATE VIEW lock_view1 AS SELECT 1; CREATE VIEW lock_view1 AS SELECT 1 AS a;
CREATE MATERIALIZED VIEW lock_mv1 AS SELECT * FROM lock_view1;
CREATE INDEX lock_mvi1 ON lock_mv1 (a);
CREATE SEQUENCE lock_seq;
CREATE ROLE regress_rol_lock1; CREATE ROLE regress_rol_lock1;
ALTER ROLE regress_rol_lock1 SET search_path = lock_schema1; ALTER ROLE regress_rol_lock1 SET search_path = lock_schema1;
GRANT USAGE ON SCHEMA lock_schema1 TO regress_rol_lock1; GRANT USAGE ON SCHEMA lock_schema1 TO regress_rol_lock1;
@ -33,7 +36,7 @@ LOCK TABLE lock_tbl1 IN SHARE MODE NOWAIT;
LOCK TABLE lock_tbl1 IN SHARE ROW EXCLUSIVE MODE NOWAIT; LOCK TABLE lock_tbl1 IN SHARE ROW EXCLUSIVE MODE NOWAIT;
LOCK TABLE lock_tbl1 IN EXCLUSIVE MODE NOWAIT; LOCK TABLE lock_tbl1 IN EXCLUSIVE MODE NOWAIT;
LOCK TABLE lock_tbl1 IN ACCESS EXCLUSIVE MODE NOWAIT; LOCK TABLE lock_tbl1 IN ACCESS EXCLUSIVE MODE NOWAIT;
LOCK TABLE lock_view1 IN EXCLUSIVE MODE; -- Will fail; can't lock a non-table LOCK TABLE lock_view1 IN EXCLUSIVE MODE;
ROLLBACK; ROLLBACK;
-- Verify that we can lock a table with inheritance children. -- Verify that we can lock a table with inheritance children.
@ -55,13 +58,23 @@ LOCK TABLE ONLY lock_tbl1;
ROLLBACK; ROLLBACK;
RESET ROLE; RESET ROLE;
-- Lock other relations
BEGIN TRANSACTION;
LOCK TABLE lock_mv1;
LOCK TABLE lock_mvi1;
LOCK TABLE lock_seq;
ROLLBACK;
-- --
-- Clean up -- Clean up
-- --
DROP MATERIALIZED VIEW lock_mv1;
DROP VIEW lock_view1; DROP VIEW lock_view1;
DROP TABLE lock_tbl3; DROP TABLE lock_tbl3;
DROP TABLE lock_tbl2; DROP TABLE lock_tbl2;
DROP TABLE lock_tbl1; DROP TABLE lock_tbl1;
DROP SEQUENCE lock_seq;
DROP SCHEMA lock_schema1 CASCADE; DROP SCHEMA lock_schema1 CASCADE;
DROP ROLE regress_rol_lock1; DROP ROLE regress_rol_lock1;