Allow UNLISTEN in hot-standby mode.

Since LISTEN is (still) disallowed, UNLISTEN must be a no-op in a
hot-standby session, and so there's no harm in allowing it.  This
change allows client code to not worry about whether it's connected
to a primary or standby server when performing session-state-reset
type activities.  (Note that DISCARD ALL, which includes UNLISTEN,
was already allowed, making it inconsistent to reject UNLISTEN.)

Per discussion, back-patch to all supported versions.

Shay Rojansky, reviewed by Mi Tar

Discussion: https://postgr.es/m/CADT4RqCf2gA_TJtPAjnGzkC3ZiexfBZiLmA-mV66e4UyuVv8bA@mail.gmail.com

diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index 23de642a0c19f9da420881ce64a041912b1eecad..528e6a9f4c410ea364b6eb57a1851ac842a376b8 100644 (file)
--- a/doc/src/sgml/high-availability.sgml
+++ b/doc/src/sgml/high-availability.sgml
@@ -1768,6 +1768,11 @@ if (!triggered)
        Plugins and extensions - LOAD
       
      
+     
+      
+       UNLISTEN
+      
+     
     
    
 
@@ -1857,7 +1862,7 @@ if (!triggered)
      
      
       
-       LISTEN, UNLISTEN, NOTIFY
+       LISTEN, NOTIFY
       
      
     
@@ -1865,8 +1870,8 @@ if (!triggered)
 
    
     In normal operation, read-only transactions are allowed to
-    use LISTEN>, UNLISTEN, and
-    NOTIFY, so Hot Standby sessions operate under slightly tighter
+    use LISTENcommand> and NOTIFY,
+    so Hot Standby sessions operate under slightly tighter
     restrictions than ordinary read-only sessions.  It is possible that some
     of these restrictions might be loosened in a future release.
    

diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 135286ebbfb939df76c36877df4b35daf095e68e..75faf37a71493857796571420d2462fbe27c7fcb 100644 (file)
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -641,7 +641,7 @@ standard_ProcessUtility(PlannedStmt *pstmt,
            {
                UnlistenStmt *stmt = (UnlistenStmt *) parsetree;
 
-               PreventCommandDuringRecovery("UNLISTEN");
+               /* we allow UNLISTEN during recovery, as it's a noop */
                CheckRestrictedOperation("UNLISTEN");
                if (stmt->conditionname)
                    Async_Unlisten(stmt->conditionname);

diff --git a/src/test/regress/expected/hs_standby_allowed.out b/src/test/regress/expected/hs_standby_allowed.out
index 526f88f2bec3bba1ba2aec99cedae2e4db035024..00b8faf9eb66e0619d70ac3badec85c446a1fc69 100644 (file)
--- a/src/test/regress/expected/hs_standby_allowed.out
+++ b/src/test/regress/expected/hs_standby_allowed.out
@@ -208,6 +208,9 @@ LOCK hs1 IN ACCESS SHARE MODE;
 LOCK hs1 IN ROW SHARE MODE;
 LOCK hs1 IN ROW EXCLUSIVE MODE;
 COMMIT;
+-- UNLISTEN
+UNLISTEN a;
+UNLISTEN *;
 -- LOAD
 -- should work, easier if there is no test for that...
 -- ALLOWED COMMANDS

diff --git a/src/test/regress/expected/hs_standby_disallowed.out b/src/test/regress/expected/hs_standby_disallowed.out
index bc117413ffdb375a0279269276581e22430ec904..dff0953e9a6987a45d669f26269d2088d9e74db9 100644 (file)
--- a/src/test/regress/expected/hs_standby_disallowed.out
+++ b/src/test/regress/expected/hs_standby_disallowed.out
@@ -118,10 +118,6 @@ listen a;
 ERROR:  cannot execute LISTEN during recovery
 notify a;
 ERROR:  cannot execute NOTIFY during recovery
-unlisten a;
-ERROR:  cannot execute UNLISTEN during recovery
-unlisten *;
-ERROR:  cannot execute UNLISTEN during recovery
 -- disallowed commands
 ANALYZE hs1;
 ERROR:  cannot execute ANALYZE during recovery

diff --git a/src/test/regress/sql/hs_standby_allowed.sql b/src/test/regress/sql/hs_standby_allowed.sql
index a33199dbbdf726d282c9b68346398aa8a5a0338d..6debddc5e999a3c7f6684c3bce9a9c56921b9776 100644 (file)
--- a/src/test/regress/sql/hs_standby_allowed.sql
+++ b/src/test/regress/sql/hs_standby_allowed.sql
@@ -110,6 +110,10 @@ LOCK hs1 IN ROW SHARE MODE;
 LOCK hs1 IN ROW EXCLUSIVE MODE;
 COMMIT;
 
+-- UNLISTEN
+UNLISTEN a;
+UNLISTEN *;
+
 -- LOAD
 -- should work, easier if there is no test for that...
 

diff --git a/src/test/regress/sql/hs_standby_disallowed.sql b/src/test/regress/sql/hs_standby_disallowed.sql
index 21bbf526b741337ad05b644d6661287d8b07932e..a470600eec88330d22e9bf5b1cf7bebdbf3e9a5c 100644 (file)
--- a/src/test/regress/sql/hs_standby_disallowed.sql
+++ b/src/test/regress/sql/hs_standby_disallowed.sql
@@ -88,8 +88,6 @@ COMMIT;
 -- Listen
 listen a;
 notify a;
-unlisten a;
-unlisten *;
 
 -- disallowed commands