diff options
| -rw-r--r-- | doc/src/sgml/high-availability.sgml | 11 | ||||
| -rw-r--r-- | src/backend/tcop/utility.c | 2 | ||||
| -rw-r--r-- | src/test/regress/expected/hs_standby_allowed.out | 3 | ||||
| -rw-r--r-- | src/test/regress/expected/hs_standby_disallowed.out | 4 | ||||
| -rw-r--r-- | src/test/regress/sql/hs_standby_allowed.sql | 4 | ||||
| -rw-r--r-- | src/test/regress/sql/hs_standby_disallowed.sql | 2 |
6 files changed, 16 insertions, 10 deletions
diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml index 23de642a0c1..528e6a9f4c4 100644 --- a/doc/src/sgml/high-availability.sgml +++ b/doc/src/sgml/high-availability.sgml @@ -1768,6 +1768,11 @@ if (!triggered) Plugins and extensions - <command>LOAD</> </para> </listitem> + <listitem> + <para> + <command>UNLISTEN</command> + </para> + </listitem> </itemizedlist> </para> @@ -1857,7 +1862,7 @@ if (!triggered) </listitem> <listitem> <para> - <command>LISTEN</>, <command>UNLISTEN</>, <command>NOTIFY</> + <command>LISTEN</>, <command>NOTIFY</> </para> </listitem> </itemizedlist> @@ -1865,8 +1870,8 @@ if (!triggered) <para> In normal operation, <quote>read-only</> transactions are allowed to - use <command>LISTEN</>, <command>UNLISTEN</>, and - <command>NOTIFY</>, so Hot Standby sessions operate under slightly tighter + use <command>LISTEN</command> and <command>NOTIFY</command>, + 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. </para> diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 135286ebbfb..75faf37a714 100644 --- 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 526f88f2bec..00b8faf9eb6 100644 --- 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 bc117413ffd..dff0953e9a6 100644 --- 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 a33199dbbdf..6debddc5e99 100644 --- 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 21bbf526b74..a470600eec8 100644 --- 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 |