wurk 1.7.6 → 1.8.1

data/lib/sidekiq/job/interrupt_handler.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
+require 'wurk'

data/lib/sidekiq/job/iterable/active_record_enumerator.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
+require 'wurk'

data/lib/sidekiq/job/iterable/csv_enumerator.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
+require 'wurk'

data/lib/sidekiq/job/iterable.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
+require 'wurk'

data/lib/sidekiq/job_logger.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
+require 'wurk'

data/lib/sidekiq/job_util.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
+require 'wurk'

data/lib/sidekiq/loader.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
+require 'wurk'

data/lib/sidekiq/logger.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
+require 'wurk'

data/lib/sidekiq/metrics/query.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
+require 'wurk'

data/lib/sidekiq/middleware/current_attributes.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# Drop-in require path (see lib/sidekiq.rb): defines Sidekiq::CurrentAttributes
+# (`persist`, `Save`, `Load`). Nothing is registered until `persist` is called,
+# as upstream.
+require 'wurk'
+require 'wurk/middleware/current_attributes'

data/lib/sidekiq/middleware/i18n.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# Drop-in require path (see lib/sidekiq.rb): opts into the locale-propagating
+# Sidekiq::Middleware::I18n pair, exactly as upstream's file does on require.
+require 'wurk'
+require 'wurk/middleware/i18n'

data/lib/sidekiq/middleware/modules.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
+require 'wurk'

data/lib/sidekiq/pro/web.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# Drop-in require path (sidekiq-pro.md §10): Sidekiq::Pro::Web is the same
+# dashboard as Sidekiq::Web, which Wurk loads whole.
+require 'wurk'

data/lib/sidekiq/profiler.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
+require 'wurk'

data/lib/sidekiq/redis_client_adapter.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
+require 'wurk'

data/lib/sidekiq/test_api.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# Drop-in require path (see lib/sidekiq.rb): Sidekiq 8.1's side-effect-free
+# testing API. Unlike sidekiq/testing it leaves the test mode alone.
+require 'wurk'

data/lib/sidekiq/testing/inline.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Drop-in require path, deprecated upstream exactly like sidekiq/testing.
+require 'wurk'
+
+Wurk.testing!(:inline)
+warn('⛔️ `require "sidekiq/testing/inline"` is deprecated and will be removed in Sidekiq 9.0. ' \
+     'Use `Sidekiq.testing!(:inline)` instead.')

data/lib/sidekiq/transaction_aware_client.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
+require 'wurk'

data/lib/sidekiq/worker_compatibility_alias.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
+require 'wurk'

data/lib/sidekiq-ent/periodic/testing.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# Drop-in require path (sidekiq-ent.md §2.5): Sidekiq::Periodic::ConfigTester
+# ships with Wurk's cron.
+require 'wurk'

data/lib/sidekiq-ent/web.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# Drop-in require path (sidekiq-ent.md §9): the Limits, Periodic and History
+# tabs are part of Wurk's one dashboard, loaded whole.
+require 'wurk'

data/lib/sidekiq-ent.rb

@@ -0,0 +1,7 @@
+# rubocop:disable Naming/FileName -- the gem's own require name, hyphen included
+# frozen_string_literal: true
+
+# Drop-in require path (sidekiq-ent.md, top): Wurk ships every Enterprise
+# feature in the one gem, so this only has to load it.
+require 'wurk'
+# rubocop:enable Naming/FileName

data/lib/sidekiq-pro.rb

@@ -0,0 +1,7 @@
+# rubocop:disable Naming/FileName -- the gem's own require name, hyphen included
+# frozen_string_literal: true
+
+# Drop-in require path (sidekiq-pro.md, top): Wurk ships every Pro feature in
+# the one gem, so this only has to load it.
+require 'wurk'
+# rubocop:enable Naming/FileName

data/lib/wurk/api/fast.rb

@@ -1,23 +1,22 @@
 # frozen_string_literal: true
 
 require_relative '../lua'
-require_relative '../job_record'
 
 module Wurk
   module API
     # Pro parity (§11): Lua-backed O(1)-round-trip replacements for the
-    # ruby-side LRANGE / ZSCAN loops in Queue and SortedSet. Mixed into the
-    # existing data API classes so the surface is `Sidekiq::Queue#delete_job(jid)`,
-    # `Sidekiq::DeadSet#scan(pattern) { |JobRecord| … }` etc. — wire-compat
-    # with Pro consumer code that drops in on a one-line require swap.
+    # ruby-side LRANGE loops in Queue. Mixed into the existing data API class
+    # so the surface is `Sidekiq::Queue#delete_job(jid)` — wire-compat with Pro
+    # consumer code that drops in on a one-line require swap.
     #
     # We don't reimplement `Queue#size` (already LLEN, unchanged per spec).
     module Fast
       # Extension to Wurk::Queue. Pure server-side delete by jid / class — no
-      # network round-trips per match. Returns the count of payloads removed.
+      # network round-trips per match.
       module QueueExt
-        # @return [Integer] payloads removed (0 when jid absent; >0 only in
-        #   the corner case of duplicate-jid corruption).
+        # @return [String, nil] the deleted job's JSON, or nil when no job in
+        #   the queue has that jid — Pro's contract, so `if q.delete_job(jid)`
+        #   branches on whether anything was removed.
         def delete_job(jid)
           raise ArgumentError, 'jid required' if jid.nil? || jid.to_s.empty?
 
@@ -28,7 +27,7 @@ module Wurk
               keys: [Keys.queue(name)],
               argv: [jid.to_s]
             )
-          end.to_i
+          end
         end
 
         # @param klass [Class, String, Symbol]
@@ -47,32 +46,8 @@ module Wurk
           end.to_i
         end
       end
-
-      # Extension to Wurk::SortedSet / JobSet. The base `scan(match, count)`
-      # already yields `(value, score)` pairs via ZSCAN — Pro promotes the
-      # surface to yield `JobRecord` directly so callers can `entry.delete`
-      # / `entry.retry` without re-parsing JSON.
-      #
-      # The new behavior is enabled by *block arity*: a 1-arg block (or
-      # block.lambda? + a 1-param signature) receives `JobRecord`; legacy
-      # 2-arg blocks (`|value, score|`) keep the raw shape. This preserves
-      # the existing two-arg contract used by JobSet#find_job internally.
-      module SortedSetExt
-        def scan(match, count = 100, &block)
-          return enum_for(:scan, match, count) unless block
-
-          if block.arity == 1
-            super do |value, score|
-              block.call(Wurk::SortedEntry.new(self, score, value))
-            end
-          else
-            super
-          end
-        end
-      end
     end
   end
 end
 
 Wurk::Queue.include(Wurk::API::Fast::QueueExt)
-Wurk::SortedSet.prepend(Wurk::API::Fast::SortedSetExt)

data/lib/wurk/api/idempotency.rb

@@ -95,17 +95,40 @@ module Wurk
         reserved ? nil : existing.to_s
       end
 
+      # Errors that prove the write they interrupted never applied: refused
+      # while dialing, a starved checkout, or a reply in which Redis itself
+      # rejected the command.
+      PRE_APPLY_ERRORS = [
+        ::RedisClient::CannotConnectError, ::RedisClient::FailoverError,
+        ::RedisClient::CommandError, ::ConnectionPool::TimeoutError
+      ].freeze
+
       # Only a success is worth replaying. A rejected body is a request the
-      # client should be able to correct and send again under the same key, and
-      # a raise is a request whose outcome nobody knows — both release the key
-      # rather than pinning an answer to it.
+      # client should be able to correct and send again under the same key, so
+      # it releases. A raise releases only when nothing can have reached Redis
+      # — before any write went out, or on an error that proves the one in
+      # flight never applied. Anything else (a lost reply, a bulk request that
+      # died after an earlier slice landed) is an outcome nobody knows: the key
+      # stays pending until its TTL, so the client's retry is told "in flight"
+      # instead of enqueueing a second copy.
       def settle(slot, fingerprint)
+        Thread.current[::Wurk::Client::WRITE_STATE_KEY] = :clean
         response = yield
         response[0] < 300 ? record(slot, fingerprint, response) : release(slot)
         response
-      rescue StandardError
-        release(slot)
+      rescue StandardError => e
+        release(slot) unless outcome_unknown?(e)
         raise
+      ensure
+        Thread.current[::Wurk::Client::WRITE_STATE_KEY] = nil
+      end
+
+      def outcome_unknown?(error)
+        case Thread.current[::Wurk::Client::WRITE_STATE_KEY]
+        when :applied then true
+        when :attempted then PRE_APPLY_ERRORS.none? { |klass| error.is_a?(klass) }
+        else false
+        end
       end
 
       # KEEPTTL so the window is the first request's, not this write's, and XX

data/lib/wurk/api/swarm.rb

@@ -134,7 +134,7 @@ module Wurk
       def limiters(request)
         query = Page.query!(request)
         window = Page.window(query)
-        names = ::Wurk::Web::Enterprise::Limits.list(filter: filter!(query))
+        names = ::Wurk::Web::Enterprise::Limits.list(filter: filter!(query), sweep: !ReadOnly.enabled?(request))
         rows = Page.slice(names, window) { |name| limiter_row(name) }
         Response.json(200, total: names.size, page: window.page, count: window.count, limiters: rows)
       end