Add CheckTableNotInUse calls in DROP TABLE and DROP INDEX.

Recent releases had a check on rel->rd_refcnt in heap_drop_with_catalog,
but failed to cover the possibility of pending trigger events at DROP time.
(Before 8.4 we didn't even check the refcnt.)  When the trigger events were
eventually fired, you'd get "could not open relation with OID nnn" errors,
as in recent report from strk.  Better to throw a suitable error when the
DROP is attempted.

Also add a similar check in DROP INDEX.

Back-patch to all supported branches.

diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 1d1e395d6f7a3a4d6dcfa9dd390ca53411122ccb..9efef44778543b5f3e249ba6bc2c052886b0e80a 100644 (file)
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -1373,6 +1373,13 @@ heap_drop_with_catalog(Oid relid)
         */
        rel = relation_open(relid, AccessExclusiveLock);
 
+       /*
+        * There can no longer be anyone *else* touching the relation, but we
+        * might still have open queries or cursors, or pending trigger events,
+        * in our own session.
+        */
+       CheckTableNotInUse(rel, "DROP TABLE");
+
        /*
         * Schedule unlinking of the relation's physical file at commit.
         */

diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 96cd5f29692a124188c7879c23ad2d1cdca1d865..0f33de7b60debcc1e111d0b4d7bb1c09b3149ead 100644 (file)
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -881,6 +881,12 @@ index_drop(Oid indexId)
 
        userIndexRelation = index_open(indexId, AccessExclusiveLock);
 
+       /*
+        * There can no longer be anyone *else* touching the index, but we
+        * might still have open queries using it in our own session.
+        */
+       CheckTableNotInUse(userIndexRelation, "DROP INDEX");
+
        /*
         * Schedule physical removal of the file
         */