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 <[email protected]>
Reviewed-by: Tom Lane <[email protected]>
Reported-by: Wells Oliver <[email protected]>
Discussion: https://postgr.es/m/20201021200659[email protected]

diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml
index 4cdfae2279e3e80d32bdc86f061fc44cf91ddbfa..37881f25ac57d68e3f913ba86839c1c7179fc75d 100644 (file)
--- a/doc/src/sgml/ref/lock.sgml
+++ b/doc/src/sgml/ref/lock.sgml
@@ -16,7 +16,7 @@ PostgreSQL documentation
 
  <refnamediv>
   <refname>LOCK</refname>
-  <refpurpose>lock a table</refpurpose>
+  <refpurpose>lock a named relation (table, etc)</refpurpose>
  </refnamediv>
 
  <refsynopsisdiv>
@@ -34,7 +34,9 @@ LOCK [ TABLE ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ]
   <title>Description</title>
 
   <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
    <literal>NOWAIT</literal> is specified, <command>LOCK
    TABLE</command> does not wait to acquire the desired lock: if it
@@ -115,17 +117,18 @@ LOCK [ TABLE ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ]
     <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
-      The name (optionally schema-qualified) of an existing table to
-      lock. If <literal>ONLY</literal> is specified before the table name, only that
+      The name (optionally schema-qualified) of an existing relation to
+      lock. If <literal>ONLY</literal> is specified before a table name, only that
       table is locked. If <literal>ONLY</literal> is not specified, the table and all
       its descendant tables (if any) are locked.  Optionally, <literal>*</literal>
       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>
       The command <literal>LOCK TABLE a, b;</literal> is equivalent to
-      <literal>LOCK TABLE a; LOCK TABLE b;</literal>. 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
       TABLE</command> command.
      </para>

diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c
index d8cafc42bb546c3c97b3e79ee68f65e8b0eabc9f..f64246dba3917eacc4b4b0b8271fc22262561e08 100644 (file)
--- a/src/backend/commands/lockcmds.c
+++ b/src/backend/commands/lockcmds.c
@@ -83,14 +83,6 @@ RangeVarCallbackForLockTable(const RangeVar *rv, Oid relid, Oid oldrelid,
        return;                 /* woops, concurrently dropped; no permissions
                                 * check */
 
-   /* Currently, we only allow plain tables or views to be locked */
-   if (relkind != RELKIND_RELATION && relkind != RELKIND_PARTITIONED_TABLE &&
-       relkind != RELKIND_VIEW)
-       ereport(ERROR,
-               (errcode(ERRCODE_WRONG_OBJECT_TYPE),
-                errmsg("\"%s\" is not a table or view",
-                       rv->relname)));
-
    /*
     * Make note if a temporary relation has been accessed in this
     * transaction.
@@ -186,11 +178,13 @@ LockViewRecurse_walker(Node *node, LockViewRecurse_context *context)
        foreach(rtable, query->rtable)
        {
            RangeTblEntry *rte = lfirst(rtable);
+           Oid         relid;
            AclResult   aclresult;
 
-           Oid         relid = rte->relid;
-           char        relkind = rte->relkind;
-           char       *relname = get_rel_name(relid);
+           /* ignore all non-relation RTEs */
+           if (rte->rtekind != RTE_RELATION)
+               continue;
+           relid = rte->relid;
 
            /*
             * The OLD and NEW placeholder entries in the view's rtable are
@@ -201,11 +195,6 @@ LockViewRecurse_walker(Node *node, LockViewRecurse_context *context)
                 strcmp(rte->eref->aliasname, "new") == 0))
                continue;
 
-           /* Currently, we only allow plain tables or views to be locked. */
-           if (relkind != RELKIND_RELATION && relkind != RELKIND_PARTITIONED_TABLE &&
-               relkind != RELKIND_VIEW)
-               continue;
-
            /* Check infinite recursion in the view definition. */
            if (list_member_oid(context->ancestor_views, relid))
                ereport(ERROR,
@@ -216,7 +205,8 @@ LockViewRecurse_walker(Node *node, LockViewRecurse_context *context)
            /* Check permissions with the view owner's privilege. */
            aclresult = LockTableAclCheck(relid, context->lockmode, context->viewowner);
            if (aclresult != ACLCHECK_OK)
-               aclcheck_error(aclresult, get_relkind_objtype(relkind), relname);
+               aclcheck_error(aclresult, get_relkind_objtype(rte->relkind),
+                              get_rel_name(relid));
 
            /* We have enough rights to lock the relation; do so. */
            if (!context->nowait)
@@ -225,9 +215,9 @@ LockViewRecurse_walker(Node *node, LockViewRecurse_context *context)
                ereport(ERROR,
                        (errcode(ERRCODE_LOCK_NOT_AVAILABLE),
                         errmsg("could not obtain lock on relation \"%s\"",
-                               relname)));
+                               get_rel_name(relid))));
 
-           if (relkind == RELKIND_VIEW)
+           if (rte->relkind == RELKIND_VIEW)
                LockViewRecurse(relid, context->lockmode, context->nowait, context->ancestor_views);
            else if (rte->inh)
                LockTableRecurse(relid, context->lockmode, context->nowait);

diff --git a/src/test/regress/expected/lock.out b/src/test/regress/expected/lock.out
index 2e54688dffe32f73daf4ea608b1393ef99d277c0..1d6a4e9f1e0009d1553683f55375138f5f401b8e 100644 (file)
--- a/src/test/regress/expected/lock.out
+++ b/src/test/regress/expected/lock.out
@@ -12,6 +12,9 @@ CREATE VIEW lock_view3 AS SELECT * from lock_view2;
 CREATE VIEW lock_view4 AS SELECT (select a from lock_tbl1a limit 1) from lock_tbl1;
 CREATE VIEW lock_view5 AS SELECT * from lock_tbl1 where a in (select * from lock_tbl1a);
 CREATE VIEW lock_view6 AS SELECT * from (select * from lock_tbl1) sub;
+CREATE MATERIALIZED VIEW lock_mv1 AS SELECT * FROM lock_view6;
+CREATE INDEX lock_mvi1 ON lock_mv1 (a);
+CREATE SEQUENCE lock_seq;
 CREATE ROLE regress_rol_lock1;
 ALTER ROLE regress_rol_lock1 SET search_path = lock_schema1;
 GRANT USAGE ON SCHEMA lock_schema1 TO regress_rol_lock1;
@@ -154,9 +157,16 @@ BEGIN;
 LOCK TABLE ONLY lock_tbl1;
 ROLLBACK;
 RESET ROLE;
+-- Lock other relations
+BEGIN TRANSACTION;
+LOCK TABLE lock_mv1;
+LOCK TABLE lock_mvi1;
+LOCK TABLE lock_seq;
+ROLLBACK;
 --
 -- Clean up
 --
+DROP MATERIALIZED VIEW lock_mv1;
 DROP VIEW lock_view7;
 DROP VIEW lock_view6;
 DROP VIEW lock_view5;
@@ -168,6 +178,7 @@ DROP TABLE lock_tbl3;
 DROP TABLE lock_tbl2;
 DROP TABLE lock_tbl1;
 DROP TABLE lock_tbl1a;
+DROP SEQUENCE lock_seq;
 DROP SCHEMA lock_schema1 CASCADE;
 DROP ROLE regress_rol_lock1;
 -- atomic ops tests

diff --git a/src/test/regress/sql/lock.sql b/src/test/regress/sql/lock.sql
index e50cb6f06428c2b28b8fbda356449d7b2b15b3ff..98d13fc8e1e8364298d28d31366d26a446716700 100644 (file)
--- a/src/test/regress/sql/lock.sql
+++ b/src/test/regress/sql/lock.sql
@@ -13,6 +13,9 @@ CREATE VIEW lock_view3 AS SELECT * from lock_view2;
 CREATE VIEW lock_view4 AS SELECT (select a from lock_tbl1a limit 1) from lock_tbl1;
 CREATE VIEW lock_view5 AS SELECT * from lock_tbl1 where a in (select * from lock_tbl1a);
 CREATE VIEW lock_view6 AS SELECT * from (select * from lock_tbl1) sub;
+CREATE MATERIALIZED VIEW lock_mv1 AS SELECT * FROM lock_view6;
+CREATE INDEX lock_mvi1 ON lock_mv1 (a);
+CREATE SEQUENCE lock_seq;
 CREATE ROLE regress_rol_lock1;
 ALTER ROLE regress_rol_lock1 SET search_path = lock_schema1;
 GRANT USAGE ON SCHEMA lock_schema1 TO regress_rol_lock1;
@@ -117,9 +120,18 @@ LOCK TABLE ONLY lock_tbl1;
 ROLLBACK;
 RESET ROLE;
 
+-- Lock other relations
+BEGIN TRANSACTION;
+LOCK TABLE lock_mv1;
+LOCK TABLE lock_mvi1;
+LOCK TABLE lock_seq;
+ROLLBACK;
+
+
 --
 -- Clean up
 --
+DROP MATERIALIZED VIEW lock_mv1;
 DROP VIEW lock_view7;
 DROP VIEW lock_view6;
 DROP VIEW lock_view5;
@@ -130,6 +142,7 @@ DROP TABLE lock_tbl3;
 DROP TABLE lock_tbl2;
 DROP TABLE lock_tbl1;
 DROP TABLE lock_tbl1a;
+DROP SEQUENCE lock_seq;
 DROP SCHEMA lock_schema1 CASCADE;
 DROP ROLE regress_rol_lock1;