pgbus 0.16.6 → 0.17.0

data/lib/pgbus/metrics/subscriber.rb

@@ -33,6 +33,7 @@ module Pgbus
             subscribe("pgbus.job_visibility_extended") { |event| on_job_visibility_extended(event) },
             subscribe("pgbus.event_processed") { |event| on_event_processed(event) },
             subscribe("pgbus.event_failed") { |event| on_event_failed(event) },
+            subscribe("pgbus.event_skipped") { |event| on_event_skipped(event) },
             subscribe("pgbus.client.send_message") { |event| on_send_message(event) },
             subscribe("pgbus.client.send_batch") { |event| on_send_batch(event) },
             subscribe("pgbus.client.read_batch") { |event| on_read_batch(event) },
@@ -139,6 +140,19 @@ module Pgbus
           )
         end
 
+        # An idempotent handler that did not run this delivery. `reason` is what
+        # makes the skip readable: :completed/:cached is deduplication working,
+        # :owned means a second delivery arrived while the holder was still
+        # running and was deferred to it (issue #470).
+        def on_event_skipped(event)
+          payload = event.payload
+          backend.increment(
+            "#{METRIC_PREFIX}event_count", 1,
+            compact(handler: payload[:handler], routing_key: payload[:routing_key],
+                    status: "skipped", reason: payload[:reason])
+          )
+        end
+
         # ── Client (PGMQ wrapper) ─────────────────────────────────────────
 
         def on_send_message(event)

data/lib/pgbus/pgmq_schema/fixups/pgmq_v1.13.0.sql

@@ -0,0 +1,49 @@
+-- PGMQ 1.13.0 table fixup.
+--
+-- Adapted from the upstream migration
+-- pgmq-extension/sql/pgmq--1.12.0--1.13.0.sql at tag v1.13.0
+-- (blob a380ee56e856c5799dcd1486342ce910b96da64e), which is the only part of
+-- that file pgbus's upgrade cannot already reproduce: dropping every function
+-- and composite type and re-running the target schema recreates functions and
+-- types, but never touches an existing table.
+--
+-- One deliberate deviation from upstream: the guard resolves the queue table by
+-- OID via to_regclass instead of matching information_schema.columns.table_name
+-- against the formatted name. See the comment on the guard for why.
+--
+-- Every file in this directory MUST be idempotent and self-guarded. The
+-- upgrade migration applies each fixup between the recorded installed version
+-- and the target, and an install whose version was never recorded gets all of
+-- them, so a fixup can be replayed against a database that already has it.
+
+-- Partitioned queues: msg_id becomes GENERATED BY DEFAULT AS IDENTITY.
+-- pg_partman's partition_data_* tooling moves rows out of the default
+-- partition by inserting them with their existing msg_id, which
+-- GENERATED ALWAYS refuses. pgmq's own writers never supply msg_id, so this
+-- changes nothing for them.
+DO $$
+DECLARE
+    queue_record RECORD;
+    qtable TEXT;
+BEGIN
+    FOR queue_record IN SELECT queue_name FROM pgmq.meta WHERE is_partitioned LOOP
+        qtable := pgmq.format_table_name(queue_record.queue_name, 'q');
+
+        -- Resolved by OID rather than by comparing qtable to a catalog name:
+        -- validate_queue_name caps the queue at 47 *characters*, but PostgreSQL
+        -- truncates identifiers at 63 *bytes*, so a multibyte name can produce a
+        -- qtable string that never equals the stored relation name. A name
+        -- comparison would silently skip such a queue and leave msg_id at
+        -- ALWAYS, which is the exact failure this fixup exists to prevent.
+        IF EXISTS (
+            SELECT 1
+            FROM pg_catalog.pg_attribute
+            WHERE attrelid = pg_catalog.to_regclass(FORMAT('pgmq.%I', qtable))
+            AND attname = 'msg_id'
+            AND attidentity = 'a'
+        ) THEN
+            EXECUTE FORMAT('ALTER TABLE pgmq.%I ALTER COLUMN msg_id SET GENERATED BY DEFAULT', qtable);
+        END IF;
+    END LOOP;
+END;
+$$;