pgq.maint_operations: don't do rotate_step2, if nothing to rotate

1 files changed, 8 insertions, 3 deletions

diff --git a/sql/pgq/functions/pgq.maint_operations.sql b/sql/pgq/functions/pgq.maint_operations.sql
index 53aad8c6..d03b5bd6 100644
--- a/sql/pgq/functions/pgq.maint_operations.sql
+++ b/sql/pgq/functions/pgq.maint_operations.sql
@@ -17,8 +17,10 @@ returns setof record as $$
 -- ----------------------------------------------------------------------
 declare
     ops text[];
+    nrot int4;
 begin
     -- rotate step 1
+    nrot := 0;
     func_name := 'pgq.maint_rotate_tables_step1';
     for func_arg in
         select queue_name from pgq.queue
@@ -27,13 +29,16 @@ begin
                 and queue_switch_time + queue_rotation_period < current_timestamp
             order by 1
     loop
+        nrot := nrot + 1;
         return next;
     end loop;
 
     -- rotate step 2
-    func_name := 'pgq.maint_rotate_tables_step2';
-    func_arg := NULL;
-    return next;
+    if nrot > 0 then
+        func_name := 'pgq.maint_rotate_tables_step2';
+        func_arg := NULL;
+        return next;
+    end if;
 
     -- check if extra field exists
     perform 1 from pg_attribute