pgbus 0.3.3 → 0.3.5

data/config/locales/ja.yml

@@ -239,16 +239,12 @@ ja:
       index:
         description: 重複ジョブ実行を防ぐアクティブなユニークロック
         empty: アクティブなロックはありません
-        executing: 実行中
         headers:
           age: 経過時間
-          expires: 有効期限
-          job_class: ジョブクラス
           lock_key: ロックキー
-          owner: 所有者
-          state: 状態
-        queued: キューに追加済み
-        title: ジョブロック
+          msg_id: メッセージID
+          queue_name: キュー
+        title: 一意性キー
     outbox:
       index:
         description: PGMQへの公開待ちのトランザクショナルアウトボックスエントリ
@@ -305,23 +301,35 @@ ja:
         purge_confirm: "%{name} からすべてのメッセージを削除しますか？"
         resume: 再開
       show:
+        arguments: 引数
         delete_confirm: このキューを完全に削除しますか？この操作は取り消せません。
         delete_queue: キューを削除
         depth: 深さ：
         discard: 破棄
         discard_confirm: このメッセージを破棄しますか？
         empty: キューは空です
+        full_json_payload: 完全なJSONペイロード
         headers:
-          actions: アクション
           enqueued: エンキュー済み
           id: ID
-          payload: ペイロード
+          job_class: ジョブクラス
           reads: 読み取り回数
           vt: VT
+        headers_section: ヘッダー
+        job_id: ジョブID：
         message_discard_failed: メッセージを破棄できませんでした。
         message_discarded: メッセージを破棄しました。
         message_retried: メッセージの可視性をリセットしました。
         message_retry_failed: メッセージをリトライできませんでした。
+        metadata: メタデータ
+        metadata_labels:
+          last_read: 最終読み取り：
+          locale: ロケール：
+          priority: 優先度：
+          queue: キュー：
+          scheduled: スケジュール済み：
+          timezone: タイムゾーン：
+          visible_at: 表示可能日時：
         pause: 一時停止
         pause_confirm: 処理を一時停止しますか？
         purge_confirm: すべてのメッセージを削除しますか？
@@ -337,6 +345,10 @@ ja:
           one: "%{count} タスクが設定されています"
           other: "%{count} タスクが設定されています"
         title: 定期タスク
+      toggle:
+        disabled: タスクが無効になりました
+        enabled: タスクが有効になりました
+        failed: タスクの切り替えに失敗しました
       show:
         back: 戻る
         configuration: 設定

data/config/locales/nb.yml

@@ -239,16 +239,12 @@ nb:
       index:
         description: Aktive unike låser som forhindrer duplisert jobbkjøring
         empty: Ingen aktive låser
-        executing: Utfører
         headers:
           age: Alder
-          expires: Utløper
-          job_class: Jobbklasse
           lock_key: Låsenøkkel
-          owner: Eier
-          state: Status
-        queued: I kø
-        title: Jobblåser
+          msg_id: Meldings-ID
+          queue_name: Kø
+        title: Unikhetsnøkler
     outbox:
       index:
         description: Transaksjonelle utgående postkasseoppføringer som venter på publisering til PGMQ
@@ -305,23 +301,35 @@ nb:
         purge_confirm: Rens alle meldinger fra %{name}?
         resume: Gjenoppta
       show:
+        arguments: Argumenter
         delete_confirm: Slette denne køen permanent? Dette kan ikke angres.
         delete_queue: Slett kø
         depth: 'Dybde:'
         discard: Forkast
         discard_confirm: Forkaste denne meldingen?
         empty: Køen er tom
+        full_json_payload: Full JSON-payload
         headers:
-          actions: Handlinger
           enqueued: I kø
           id: ID
-          payload: Innhold
+          job_class: Jobbklasse
           reads: Lesninger
           vt: VT
+        headers_section: Overskrifter
+        job_id: 'Jobb-ID:'
         message_discard_failed: Kunne ikke forkaste meldingen.
         message_discarded: Melding forkastet.
         message_retried: Meldingens synlighet tilbakestilt.
         message_retry_failed: Kunne ikke prøve meldingen igjen.
+        metadata: Metadata
+        metadata_labels:
+          last_read: 'Sist lest:'
+          locale: 'Språk:'
+          priority: 'Prioritet:'
+          queue: 'Kø:'
+          scheduled: 'Planlagt:'
+          timezone: 'Tidssone:'
+          visible_at: 'Synlig fra:'
         pause: Pause
         pause_confirm: Pause behandling?
         purge_confirm: Rens alle meldinger?
@@ -337,6 +345,10 @@ nb:
           one: "%{count} oppgave konfigurert"
           other: "%{count} oppgaver konfigurert"
         title: Gjentakende oppgaver
+      toggle:
+        disabled: Oppgave deaktivert
+        enabled: Oppgave aktivert
+        failed: Kunne ikke endre oppgave
       show:
         back: Tilbake
         configuration: Konfigurasjon

data/config/locales/nl.yml

@@ -239,16 +239,12 @@ nl:
       index:
         description: Actieve uniekheidsvergrendelingen voorkomen dubbele taakuitvoering
         empty: Geen actieve vergrendelingen
-        executing: Uitvoeren
         headers:
           age: Leeftijd
-          expires: Verloopt
-          job_class: Taakklasse
           lock_key: Vergrendelingssleutel
-          owner: Eigenaar
-          state: Status
-        queued: In wachtrij
-        title: Taakvergrendelingen
+          msg_id: Bericht-ID
+          queue_name: Wachtrij
+        title: Uniciteitsleutels
     outbox:
       index:
         description: Transactionele uitgaande berichten wachten op publicatie naar PGMQ
@@ -305,23 +301,35 @@ nl:
         purge_confirm: Alle berichten verwijderen uit %{name}?
         resume: Hervatten
       show:
+        arguments: Argumenten
         delete_confirm: Deze wachtrij permanent verwijderen? Dit kan niet ongedaan worden gemaakt.
         delete_queue: Wachtrij verwijderen
         depth: 'Diepte:'
         discard: Verwerpen
         discard_confirm: Dit bericht verwerpen?
         empty: Wachtrij is leeg
+        full_json_payload: Volledige JSON payload
         headers:
-          actions: Acties
           enqueued: In de wachtrij geplaatst
           id: ID
-          payload: Inhoud
+          job_class: Taakklasse
           reads: Lezingen
           vt: VT
+        headers_section: Headers
+        job_id: 'Taak ID:'
         message_discard_failed: Kon bericht niet verwerpen.
         message_discarded: Bericht verworpen.
         message_retried: Zichtbaarheid van bericht gereset.
         message_retry_failed: Kon bericht niet opnieuw proberen.
+        metadata: Metadata
+        metadata_labels:
+          last_read: 'Laatst gelezen:'
+          locale: 'Locale:'
+          priority: 'Prioriteit:'
+          queue: 'Wachtrij:'
+          scheduled: 'Gepland:'
+          timezone: 'Tijdzone:'
+          visible_at: 'Zichtbaar op:'
         pause: Pauzeren
         pause_confirm: Verwerking pauzeren?
         purge_confirm: Alle berichten verwijderen?
@@ -337,6 +345,10 @@ nl:
           one: "%{count} taak geconfigureerd"
           other: "%{count} taken geconfigureerd"
         title: Terugkerende taken
+      toggle:
+        disabled: Taak uitgeschakeld
+        enabled: Taak ingeschakeld
+        failed: Kon taak niet omschakelen
       show:
         back: Terug
         configuration: Configuratie

data/config/locales/pt.yml

@@ -239,16 +239,12 @@ pt:
       index:
         description: Bloqueios de exclusividade ativos impedindo a execução duplicada do trabalho
         empty: Nenhum bloqueio ativo
-        executing: Executando
         headers:
           age: Idade
-          expires: Expira
-          job_class: Classe do Trabalho
           lock_key: Chave de Bloqueio
-          owner: Proprietário
-          state: Estado
-        queued: Na fila
-        title: Bloqueios de Trabalho
+          msg_id: ID da mensagem
+          queue_name: Fila
+        title: Chaves de unicidade
     outbox:
       index:
         description: Entradas da caixa de saída transacional pendentes de publicação para PGMQ
@@ -305,23 +301,35 @@ pt:
         purge_confirm: Limpar todas as mensagens de %{name}?
         resume: Retomar
       show:
+        arguments: Argumentos
         delete_confirm: Excluir permanentemente esta fila? Esta ação não pode ser desfeita.
         delete_queue: Excluir fila
         depth: 'Profundidade:'
         discard: Descartar
         discard_confirm: Descartar esta mensagem?
         empty: Fila está vazia
+        full_json_payload: Carga JSON completa
         headers:
-          actions: Ações
           enqueued: Enfileirado
           id: ID
-          payload: Carga útil
+          job_class: Classe do Trabalho
           reads: Leituras
           vt: VT
+        headers_section: Cabeçalhos
+        job_id: 'ID do Trabalho:'
         message_discard_failed: Não foi possível descartar a mensagem.
         message_discarded: Mensagem descartada.
         message_retried: Visibilidade da mensagem redefinida.
         message_retry_failed: Não foi possível tentar novamente a mensagem.
+        metadata: Metadados
+        metadata_labels:
+          last_read: 'Última leitura:'
+          locale: 'Localidade:'
+          priority: 'Prioridade:'
+          queue: 'Fila:'
+          scheduled: 'Agendado:'
+          timezone: 'Fuso horário:'
+          visible_at: 'Visível em:'
         pause: Pausar
         pause_confirm: Pausar processamento?
         purge_confirm: Limpar todas as mensagens?
@@ -337,6 +345,10 @@ pt:
           one: "%{count} tarefa configurada"
           other: "%{count} tarefas configuradas"
         title: Tarefas Recorrentes
+      toggle:
+        disabled: Tarefa desativada
+        enabled: Tarefa ativada
+        failed: Falha ao alternar tarefa
       show:
         back: Voltar
         configuration: Configuração

data/config/locales/sv.yml

@@ -239,16 +239,12 @@ sv:
       index:
         description: Aktiva unika lås som förhindrar duplicerad jobbexekvering
         empty: Inga aktiva lås
-        executing: Utför
         headers:
           age: Ålder
-          expires: Upphör
-          job_class: Jobbklass
           lock_key: Låsningsnyckel
-          owner: Ägare
-          state: Status
-        queued: I kö
-        title: Jobblås
+          msg_id: Meddelande-ID
+          queue_name: Kö
+        title: Unikhetsnycklar
     outbox:
       index:
         description: Transaktionella utboxposter som väntar på publicering till PGMQ
@@ -305,23 +301,35 @@ sv:
         purge_confirm: Rensa alla meddelanden från %{name}?
         resume: Återuppta
       show:
+        arguments: Argument
         delete_confirm: Ta bort denna kö permanent? Detta kan inte ångras.
         delete_queue: Ta bort kö
         depth: 'Djup:'
         discard: Kassera
         discard_confirm: Kassera detta meddelande?
         empty: Kön är tom
+        full_json_payload: Fullständig JSON-payload
         headers:
-          actions: Åtgärder
           enqueued: Inlagd
           id: ID
-          payload: Innehåll
+          job_class: Jobbklass
           reads: Läsningar
           vt: VT
+        headers_section: Headers
+        job_id: 'Jobb-ID:'
         message_discard_failed: Kunde inte kassera meddelandet.
         message_discarded: Meddelande kasserat.
         message_retried: Meddelandets synlighet återställd.
         message_retry_failed: Kunde inte försöka igen med meddelandet.
+        metadata: Metadata
+        metadata_labels:
+          last_read: 'Senast läst:'
+          locale: 'Språk:'
+          priority: 'Prioritet:'
+          queue: 'Kö:'
+          scheduled: 'Schemalagt:'
+          timezone: 'Tidszon:'
+          visible_at: 'Synlig vid:'
         pause: Pausa
         pause_confirm: Pausa bearbetning?
         purge_confirm: Rensa alla meddelanden?
@@ -337,6 +345,10 @@ sv:
           one: "%{count} uppgift konfigurerad"
           other: "%{count} uppgifter konfigurerade"
         title: Återkommande uppgifter
+      toggle:
+        disabled: Uppgift inaktiverad
+        enabled: Uppgift aktiverad
+        failed: Kunde inte ändra uppgift
       show:
         back: Tillbaka
         configuration: Konfiguration

data/config/routes.rb

@@ -22,6 +22,8 @@ Pgbus::Engine.routes.draw do
       post :retry_all
       post :discard_all
       post :discard_all_enqueued
+      post :discard_selected_failed
+      post :discard_selected_enqueued
     end
   end
 
@@ -48,11 +50,20 @@ Pgbus::Engine.routes.draw do
     collection do
       post :retry_all
       post :discard_all
+      post :discard_selected
     end
   end
 
   resources :outbox, only: [:index], controller: "outbox"
-  resources :locks, only: [:index]
+  resources :locks, only: [:index] do
+    member do
+      post :discard
+    end
+    collection do
+      post :discard_selected
+      post :discard_all
+    end
+  end
   resource :insights, only: [:show], controller: "insights"
 
   get :set_locale, to: "locale#update"

data/lib/generators/pgbus/migrate_job_locks_generator.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "rails/generators"
+require "rails/generators/active_record"
+
+module Pgbus
+  module Generators
+    class MigrateJobLocksGenerator < Rails::Generators::Base
+      include ActiveRecord::Generators::Migration
+
+      source_root File.expand_path("templates", __dir__)
+
+      desc "Migrate pgbus_job_locks to lightweight pgbus_uniqueness_keys table"
+
+      class_option :database,
+                   type: :string,
+                   default: nil,
+                   desc: "Use a separate database for pgbus tables (e.g. --database=pgbus)"
+
+      def create_migration_file
+        if separate_database?
+          migration_template "migrate_job_locks_to_uniqueness_keys.rb.erb",
+                             "db/pgbus_migrate/migrate_pgbus_job_locks_to_uniqueness_keys.rb"
+        else
+          migration_template "migrate_job_locks_to_uniqueness_keys.rb.erb",
+                             "db/migrate/migrate_pgbus_job_locks_to_uniqueness_keys.rb"
+        end
+      end
+
+      def display_post_install
+        say ""
+        say "Pgbus uniqueness keys migration created!", :green
+        say ""
+        say "This migration will:"
+        say "  1. Create the new pgbus_uniqueness_keys table (3 columns, 1 index)"
+        say "  2. Migrate existing locks from pgbus_job_locks"
+        say "  3. Drop the old pgbus_job_locks table (8 columns, 3 indexes)"
+        say ""
+        say "Next steps:"
+        say "  1. Run: rails db:migrate#{":#{options[:database]}" if separate_database?}"
+        say "  2. Restart pgbus: bin/pgbus start"
+        say ""
+      end
+
+      private
+
+      def migration_version
+        "[#{ActiveRecord::Migration.current_version}]"
+      end
+
+      def separate_database?
+        options[:database].present?
+      end
+    end
+  end
+end

data/lib/generators/pgbus/templates/add_uniqueness_keys.rb.erb

@@ -0,0 +1,13 @@
+class AddPgbusUniquenessKeys < ActiveRecord::Migration<%= migration_version %>
+  def change
+    create_table :pgbus_uniqueness_keys, id: false do |t|
+      t.string :lock_key, null: false
+      t.string :queue_name, null: false
+      t.bigint :msg_id, null: false
+      t.datetime :created_at, null: false, default: -> { "CURRENT_TIMESTAMP" }
+    end
+
+    add_index :pgbus_uniqueness_keys, :lock_key,
+      unique: true, name: "idx_pgbus_uniqueness_keys_key"
+  end
+end

data/lib/generators/pgbus/templates/migrate_job_locks_to_uniqueness_keys.rb.erb

@@ -0,0 +1,33 @@
+class MigratePgbusJobLocksToUniquenessKeys < ActiveRecord::Migration<%= migration_version %>
+  def up
+    # Create the new lightweight uniqueness keys table
+    unless table_exists?(:pgbus_uniqueness_keys)
+      create_table :pgbus_uniqueness_keys, id: false do |t|
+        t.string :lock_key, null: false
+        t.string :queue_name, null: false
+        t.bigint :msg_id, null: false
+        t.datetime :created_at, null: false, default: -> { "CURRENT_TIMESTAMP" }
+      end
+
+      add_index :pgbus_uniqueness_keys, :lock_key,
+        unique: true, name: "idx_pgbus_uniqueness_keys_key"
+    end
+
+    # Drop the old table. Require it to be empty — active locks should be
+    # drained before migrating (stop workers, let VT expire, restart).
+    if table_exists?(:pgbus_job_locks)
+      count = execute("SELECT COUNT(*) FROM pgbus_job_locks").first["count"].to_i
+      if count > 0
+        raise "pgbus_job_locks has #{count} active lock(s). " \
+              "Drain workers and wait for locks to clear before migrating."
+      end
+
+      drop_table :pgbus_job_locks
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration,
+          "Cannot safely reconstruct pgbus_job_locks from pgbus_uniqueness_keys"
+  end
+end

data/lib/pgbus/active_job/executor.rb

@@ -7,9 +7,10 @@ module Pgbus
     class Executor
       attr_reader :client, :config
 
-      def initialize(client: Pgbus.client, config: Pgbus.configuration)
+      def initialize(client: Pgbus.client, config: Pgbus.configuration, stat_buffer: nil)
         @client = client
         @config = config
+        @stat_buffer = stat_buffer
       end
 
       def execute(message, queue_name, source_queue: nil)
@@ -29,15 +30,14 @@ module Pgbus
         job_class = payload["job_class"]
         uniqueness_key = Uniqueness.extract_key(payload)
         uniqueness_strategy = Uniqueness.extract_strategy(payload)
-        uniqueness_ttl = payload[Uniqueness::TTL_KEY] || Uniqueness::DEFAULT_LOCK_TTL
 
         if uniqueness_key
           case uniqueness_strategy
           when :until_executed
-            # Transition the queued lock to executing state with our PID.
-            # The lock was acquired at enqueue time — now we claim ownership
-            # so the reaper can correlate it with our heartbeat.
-            Uniqueness.claim_for_execution!(uniqueness_key, ttl: uniqueness_ttl)
+            # No claim step needed — PGMQ's visibility timeout is the execution lock.
+            # The uniqueness key row was inserted at enqueue time and will be
+            # released on completion or DLQ.
+            nil
           when :while_executing
             # Acquire the lock now. If another worker is already executing
             # this job, skip it — VT will expire and it'll be retried.
@@ -96,18 +96,20 @@ module Pgbus
       def record_stat(payload, queue_name, status, start_time, message: nil)
         return unless config.stats_enabled
 
-        duration_ms = ((monotonic_now - start_time) * 1000).round
-        enqueue_latency_ms = compute_enqueue_latency(message)
-        retry_count = message ? [message.read_ct.to_i - 1, 0].max : 0
-
-        JobStat.record!(
+        attrs = {
           job_class: payload&.dig("job_class") || "unknown",
           queue_name: queue_name,
           status: status,
-          duration_ms: duration_ms,
-          enqueue_latency_ms: enqueue_latency_ms,
-          retry_count: retry_count
-        )
+          duration_ms: ((monotonic_now - start_time) * 1000).round,
+          enqueue_latency_ms: compute_enqueue_latency(message),
+          retry_count: message ? [message.read_ct.to_i - 1, 0].max : 0
+        }
+
+        if @stat_buffer
+          @stat_buffer.push(attrs)
+        else
+          JobStat.record!(**attrs)
+        end
       rescue StandardError => e
         Pgbus.logger.debug { "[Pgbus] Stat recording failed: #{e.message}" }
       end
@@ -115,18 +117,30 @@ module Pgbus
       def compute_enqueue_latency(message)
         return unless message
 
-        enqueued_at_str = message.enqueued_at
-        return unless enqueued_at_str
+        enqueued_at = message.enqueued_at
+        return unless enqueued_at
+
+        # Fast path: numeric epoch (float seconds) avoids Time.parse entirely.
+        # PGMQ returns enqueued_at as a Time or string depending on the driver.
+        case enqueued_at
+        when Numeric
+          [((Time.now.to_f - enqueued_at) * 1000).round, 0].max
+        when Time
+          [((Time.now.utc - enqueued_at.utc) * 1000).round, 0].max
+        else
+          parse_enqueue_latency_from_string(enqueued_at.to_s)
+        end
+      rescue ArgumentError, TypeError
+        nil
+      end
 
-        str = enqueued_at_str.to_s
+      def parse_enqueue_latency_from_string(str)
         # PGMQ enqueued_at is TIMESTAMPTZ (always UTC internally).
         # If the string lacks an explicit offset, assume UTC to avoid
         # misinterpretation when the system timezone is non-UTC.
         str = "#{str} UTC" unless str.match?(/[+-]\d{2}:?\d{2}\s*$|Z\s*$/i)
         enqueued_at = Time.parse(str)
         [((Time.now.utc - enqueued_at) * 1000).round, 0].max
-      rescue ArgumentError, TypeError
-        nil
       end
 
       def handle_failure(_message, _queue_name, error)

data/lib/pgbus/client.rb

@@ -76,8 +76,7 @@ module Pgbus
     def send_batch(queue_name, payloads, headers: nil, delay: 0)
       full_name = config.queue_name(queue_name)
       ensure_queue(queue_name)
-      serialized = payloads.map { |p| serialize(p) }
-      serialized_headers = headers&.map { |h| h.nil? ? nil : serialize(h) }
+      serialized, serialized_headers = serialize_batch(payloads, headers)
       Instrumentation.instrument("pgbus.client.send_batch", queue: full_name, size: payloads.size) do
         synchronized { @pgmq.produce_batch(full_name, serialized, headers: serialized_headers, delay: delay) }
       end
@@ -378,5 +377,22 @@ module Pgbus
         JSON.generate(data)
       end
     end
+
+    # Single-pass serialization of payloads and optional headers.
+    # Avoids two separate .map iterations over the same index range.
+    def serialize_batch(payloads, headers)
+      serialized = Array.new(payloads.size)
+      serialized_headers = headers ? Array.new(headers.size) : nil
+
+      payloads.each_with_index do |p, i|
+        serialized[i] = serialize(p)
+        if serialized_headers && i < headers.size
+          h = headers[i]
+          serialized_headers[i] = h.nil? ? nil : serialize(h)
+        end
+      end
+
+      [serialized, serialized_headers]
+    end
   end
 end

data/lib/pgbus/process/dispatcher.rb

@@ -144,16 +144,39 @@ module Pgbus
       end
 
       def cleanup_job_locks
-        # Primary: reap orphaned locks whose owner worker is no longer alive.
-        # Cross-references (owner_pid, owner_hostname) against pgbus_processes heartbeats.
-        reaped = JobLock.reap_orphaned!
-        Pgbus.logger.info { "[Pgbus] Reaped #{reaped} orphaned job locks" } if reaped.positive?
-
-        # Last resort: clean up locks with expired TTL (handles case where
-        # even the reaper/supervisor is dead and locks are truly abandoned).
-        expired = JobLock.cleanup_expired!
-        Pgbus.logger.debug { "[Pgbus] Cleaned up #{expired} expired job locks" } if expired.positive?
-        # No rescue here — let run_if_due handle the error and retry next tick
+        # Clean up orphaned uniqueness keys whose msg_id no longer exists
+        # in any PGMQ queue. This handles the rare case where a message is
+        # lost (e.g., queue table truncated) but the uniqueness key remains.
+        reaped = reap_orphaned_uniqueness_keys
+        Pgbus.logger.info { "[Pgbus] Reaped #{reaped} orphaned uniqueness keys" } if reaped.positive?
+      end
+
+      def reap_orphaned_uniqueness_keys
+        keys = UniquenessKey.all.to_a
+        return 0 if keys.empty?
+
+        threshold = Time.current - (config.visibility_timeout * 2)
+
+        orphaned = keys.select do |key|
+          # msg_id == 0 means pre-produce placeholder or :while_executing lock.
+          # These are live locks — never reap them based on msg_id alone.
+          # Only reap if old enough that the job is certainly gone.
+          next false if key.msg_id.zero? && (!key.created_at || key.created_at >= threshold)
+          next true if key.msg_id.zero? && key.created_at && key.created_at < threshold
+
+          # For real msg_ids, only reap if stale (old enough that VT has
+          # long expired). The message itself may still be in the queue
+          # awaiting retry — age is the only safe signal without scanning
+          # every queue table.
+          key.created_at && key.created_at < threshold
+        end
+
+        return 0 if orphaned.empty?
+
+        UniquenessKey.where(lock_key: orphaned.map(&:lock_key)).delete_all
+      rescue StandardError => e
+        Pgbus.logger.warn { "[Pgbus] Uniqueness key cleanup failed: #{e.message}" }
+        0
       end
 
       def cleanup_outbox