pgbus 0.21.2 → 0.21.4

data/lib/pgbus/pgmq_schema.rb

@@ -16,6 +16,23 @@ module Pgbus
     SCHEMA_DIR = File.expand_path("pgmq_schema", __dir__).freeze
     FIXUPS_DIR = File.join(SCHEMA_DIR, "fixups").freeze
 
+    # Wrapped around the vendored SQL by install_sql; see there.
+    SAVE_SEARCH_PATH_SQL = <<~SQL
+      DO $pgbus_save_path$
+      BEGIN
+        PERFORM pg_catalog.set_config('pgbus.install_saved_search_path', pg_catalog.current_setting('search_path'), true);
+      END
+      $pgbus_save_path$;
+    SQL
+
+    RESTORE_SEARCH_PATH_SQL = <<~SQL
+      DO $pgbus_restore_path$
+      BEGIN
+        PERFORM pg_catalog.set_config('search_path', pg_catalog.current_setting('pgbus.install_saved_search_path'), true);
+      END
+      $pgbus_restore_path$;
+    SQL
+
     class << self
       # Returns the latest vendored PGMQ version string.
       def latest_version
@@ -78,11 +95,21 @@ module Pgbus
       # Strips the extension-only pg_dump config blocks since they're
       # irrelevant when not installed as an extension.
       #
+      # From 1.13.1 upstream pins `search_path = pg_catalog, pg_temp` for the
+      # install with a transaction-local set_config, which outlives the install
+      # inside a migration (or a caller's transaction, in the client's lazy
+      # install): the next unqualified CREATE TABLE would target pg_catalog.
+      # The caller's path is saved before upstream's text and restored after,
+      # both transaction-local, so the install's pinning still applies to its
+      # own statements and nothing after them. Run the result as one string:
+      # a statement-by-statement load would lose the saved path between
+      # statements.
+      #
       # @param version [String] defaults to latest
       # @return [String] SQL
       def install_sql(version = latest_version)
-        sql = sql_for_version(version)
-        strip_extension_only_blocks(sql)
+        sql = strip_extension_only_blocks(sql_for_version(version))
+        "#{SAVE_SEARCH_PATH_SQL}\n#{sql}\n#{RESTORE_SEARCH_PATH_SQL}"
       end
 
       # Returns SQL to create the version tracking table and record an installation.
@@ -231,9 +258,12 @@ module Pgbus
           ""
         )
 
-        # Remove _belongs_to_pgmq function (checks pg_depend on extension)
+        # Remove _belongs_to_pgmq function (checks pg_depend on extension).
+        # From 1.13.1 its terminator carries `SET search_path = ...`; ending
+        # the match at a bare `LANGUAGE plpgsql;` would run on to the next
+        # function without that clause and strip everything in between.
         sql.gsub(
-          /CREATE FUNCTION pgmq\._belongs_to_pgmq.*?LANGUAGE plpgsql;/m,
+          /CREATE FUNCTION pgmq\._belongs_to_pgmq.*?\$\$\s*LANGUAGE plpgsql[^;]*;/m,
           ""
         )
       end

data/lib/pgbus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pgbus
-  VERSION = "0.21.2"
+  VERSION = "0.21.4"
 end

data/lib/pgbus/web/data_source.rb

@@ -1340,7 +1340,8 @@ module Pgbus
               (SELECT CASE WHEN is_called THEN last_value ELSE 0 END FROM pgmq.#{seq_name}) AS total_messages,
               (SELECT max(read_ct) FROM pgmq.#{qtable}) AS max_read_ct,
               (SELECT count(*) FROM pgmq.#{qtable} WHERE vt <= NOW() AND read_ct = 0) AS visible_unread_length,
-              (SELECT EXTRACT(epoch FROM (NOW() - min(vt)))::int FROM pgmq.#{qtable} WHERE vt <= NOW()) AS oldest_claimable_age_sec
+              (SELECT EXTRACT(epoch FROM (NOW() - min(vt)))::int FROM pgmq.#{qtable} WHERE vt <= NOW()) AS oldest_claimable_age_sec,
+              (SELECT EXTRACT(epoch FROM (NOW() - min(vt)))::int FROM pgmq.#{qtable} WHERE vt <= NOW() AND read_ct = 0) AS oldest_unread_claimable_age_sec
           SQL
         rescue StandardError => e
           Pgbus.logger.debug { "[Pgbus::Web] Skipping queue metrics for #{name}: #{e.message}" }
@@ -1362,7 +1363,8 @@ module Pgbus
             newest_msg_age_sec: row["newest_msg_age_sec"]&.to_i,
             total_messages: row["total_messages"].to_i,
             max_read_ct: row["max_read_ct"]&.to_i,
-            visible_unread_length: row["visible_unread_length"].to_i
+            visible_unread_length: row["visible_unread_length"].to_i,
+            oldest_unread_claimable_age_sec: row["oldest_unread_claimable_age_sec"]&.to_i
           }
         end
       rescue StandardError => e
@@ -1382,6 +1384,7 @@ module Pgbus
               EXTRACT(epoch FROM (NOW() - max(enqueued_at)))::int AS newest_msg_age_sec,
               EXTRACT(epoch FROM (NOW() - min(enqueued_at)))::int AS oldest_msg_age_sec,
               EXTRACT(epoch FROM (NOW() - min(vt) FILTER (WHERE vt <= NOW())))::int AS oldest_claimable_age_sec,
+              EXTRACT(epoch FROM (NOW() - min(vt) FILTER (WHERE vt <= NOW() AND read_ct = 0)))::int AS oldest_unread_claimable_age_sec,
               max(read_ct) AS max_read_ct,
               count(CASE WHEN vt <= NOW() AND read_ct = 0 THEN 1 END) AS visible_unread_length
             FROM pgmq.#{qtable}
@@ -1398,6 +1401,7 @@ module Pgbus
             q_summary.oldest_claimable_age_sec,
             q_summary.max_read_ct,
             q_summary.visible_unread_length,
+            q_summary.oldest_unread_claimable_age_sec,
             all_metrics.total_messages
           FROM q_summary, all_metrics
         SQL
@@ -1414,7 +1418,8 @@ module Pgbus
           newest_msg_age_sec: row["newest_msg_age_sec"]&.to_i,
           total_messages: row["total_messages"].to_i,
           max_read_ct: row["max_read_ct"]&.to_i,
-          visible_unread_length: row["visible_unread_length"].to_i
+          visible_unread_length: row["visible_unread_length"].to_i,
+          oldest_unread_claimable_age_sec: row["oldest_unread_claimable_age_sec"]&.to_i
         }
       rescue StandardError => e
         Pgbus.logger.error { "[Pgbus::Web] Error fetching metrics for #{queue_name}: #{e.class}: #{e.message}" }

data/sig/pgbus/configuration.rbs

@@ -85,6 +85,8 @@ module Pgbus
     def health_bind: () -> String
     def health_bind=: (untyped) -> untyped
     def health_port: () -> untyped
+    def health_unclaimed_grace: () -> untyped
+    def health_unclaimed_grace=: (untyped value) -> untyped
     def health_port=: (untyped) -> untyped
     def idempotency_ttl: () -> Numeric?
     def idempotency_ttl=: (untyped value) -> untyped

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgbus
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 0.21.4
 platform: ruby
 authors:
 - Mikael Henriksson
@@ -456,10 +456,12 @@ files:
 - lib/pgbus/outbox/poller.rb
 - lib/pgbus/pgmq_schema.rb
 - lib/pgbus/pgmq_schema/fixups/pgmq_v1.13.0.sql
+- lib/pgbus/pgmq_schema/fixups/pgmq_v1.13.1.sql
 - lib/pgbus/pgmq_schema/pgmq_v1.11.0.sql
 - lib/pgbus/pgmq_schema/pgmq_v1.11.1.sql
 - lib/pgbus/pgmq_schema/pgmq_v1.12.0.sql
 - lib/pgbus/pgmq_schema/pgmq_v1.13.0.sql
+- lib/pgbus/pgmq_schema/pgmq_v1.13.1.sql
 - lib/pgbus/process/claim_buffer.rb
 - lib/pgbus/process/consumer.rb
 - lib/pgbus/process/consumer_priority.rb