sidekiq-unique-jobs 7.0.0.beta14 → 7.0.0.beta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebb9d4c539ef0f829d56cf7c8f907044c4f9cee33fedb25c3a1ee56325db8376
-  data.tar.gz: f2891752e702e8060d4907fa5764855545d81974d602bb922d734ba9ba252384
+  metadata.gz: fd354b14a7f7872a112b42ea75ab268b9781b21f3c116458a1eb38e6d91c4e02
+  data.tar.gz: '02469065fc7048993402dbb9670c0e50e583f5c63d59dd113ea6d3d3bb4f471f'
 SHA512:
-  metadata.gz: f17fface6439ddf9daebc649ae8d3af8520a3e067c2fb7bba4157b0d591a2668eb90295f009e739f6496336725b4fb92ba2c78b9499c16b9aab2cf629794500f
-  data.tar.gz: 9ba022debfd062ce58d9a33dfb793dace4f0ea3edebf1577f89d315c50787f86e9ef31c372e249111e419553ab67e9779183c7c12315e779ff5b802bd6a1443e
+  metadata.gz: 2c47febf8a69f7738131a3d0bfe1b8560be1b0e4332ce933f421a0314a6a92139c71ef8b18ff249de64c84421ebb1c9cd5ff6b275795545a0abdaacbf4d08320
+  data.tar.gz: fa2378be7428b1973a7c71ffb3abb40a4d76d3ef61ea2c291c4d39790ee623e4d9a5327055b5113149c9db4787106843a6d5c0f111b64eff0677a783e3701bc7

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [v7.0.0.beta14](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.0.0.beta14) (2020-03-30)
+
+[Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.21...v7.0.0.beta14)
+
+**Fixed bugs:**
+
+- Use thread-safe digest creation mechanism [\#483](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/483) ([zormandi](https://github.com/zormandi))
+
+## [v6.0.21](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v6.0.21) (2020-03-30)
+
+[Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.0.beta13...v6.0.21)
+
+**Fixed bugs:**
+
+- Use thread-safe digest creation mechanism [\#484](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/484) ([mhenrixon](https://github.com/mhenrixon))
+
 ## [v7.0.0.beta13](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.0.0.beta13) (2020-03-26)
 
 [Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.0.beta12...v7.0.0.beta13)
@@ -117,10 +133,6 @@
 
 [Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.18...v7.0.0.beta6)
 
-**Implemented enhancements:**
-
-- Clarify usage with global\_id and sidekiq-status [\#455](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/455) ([mhenrixon](https://github.com/mhenrixon))
-
 **Merged pull requests:**
 
 - Fix that Sidekiq now sends instance of worker [\#459](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/459) ([mhenrixon](https://github.com/mhenrixon))
@@ -163,6 +175,10 @@
 
 [Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.16...v6.0.17)
 
+**Implemented enhancements:**
+
+- Clarify usage with global\_id and sidekiq-status [\#455](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/455) ([mhenrixon](https://github.com/mhenrixon))
+
 **Fixed bugs:**
 
 - Allow redis namespace to work with deletion [\#451](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/451) ([mhenrixon](https://github.com/mhenrixon))
@@ -457,6 +473,7 @@
 **Fixed bugs:**
 
 - Enable replace strategy [\#315](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/315) ([mhenrixon](https://github.com/mhenrixon))
+- Remove unused method [\#307](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/307) ([mhenrixon](https://github.com/mhenrixon))
 
 **Closed issues:**
 
@@ -474,7 +491,6 @@
 
 - Not unlocking automatically \(version 6.0.0rc5\) [\#293](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/293)
 - Bug fixes [\#310](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/310) ([mhenrixon](https://github.com/mhenrixon))
-- Remove unused method [\#307](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/307) ([mhenrixon](https://github.com/mhenrixon))
 
 ## [v6.0.1](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v6.0.1) (2018-07-31)
 
@@ -824,7 +840,6 @@
 - missed space [\#188](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/188) ([TheBigSadowski](https://github.com/TheBigSadowski))
 - Convert unless if to just 1 if [\#179](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/179) ([otzy007](https://github.com/otzy007))
 - fix for \#168. Handle the NOSCRIPT by sending the script again [\#178](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/178) ([otzy007](https://github.com/otzy007))
-- Fixed gitter badge link [\#176](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/176) ([andrew](https://github.com/andrew))
 
 ## [v4.0.17](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v4.0.17) (2016-03-02)
 
@@ -840,6 +855,7 @@
 
 **Merged pull requests:**
 
+- Fixed gitter badge link [\#176](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/176) ([andrew](https://github.com/andrew))
 - Fix for sidekiq delete failing for version 3.4.x  [\#167](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/167) ([theprogrammerin](https://github.com/theprogrammerin))
 - Run lock timeout configurable [\#164](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/164) ([Slania](https://github.com/Slania))
 

data/lib/sidekiq_unique_jobs/constants.rb

@@ -30,6 +30,7 @@ module SidekiqUniqueJobs
   ON_CLIENT_CONFLICT    ||= "on_client_conflict"
   ON_CONFLICT           ||= "on_conflict"
   ON_SERVER_CONFLICT    ||= "on_server_conflict"
+  PROCESSES             ||= "processes"
   QUEUE                 ||= "queue"
   RETRY                 ||= "retry"
   SCHEDULE              ||= "schedule"

data/lib/sidekiq_unique_jobs/lock/validator.rb

@@ -8,6 +8,8 @@ module SidekiqUniqueJobs
     # @author Mikael Henriksson <mikael@zoolutions.se>
     #
     class Validator
+      #
+      # @return [Hash] a hash mapping of deprecated keys and their new value
       DEPRECATED_KEYS = {
         UNIQUE.to_sym => LOCK.to_sym,
         UNIQUE_ARGS.to_sym => LOCK_ARGS.to_sym,
@@ -61,6 +63,12 @@ module SidekiqUniqueJobs
         lock_config
       end
 
+      #
+      # Validate deprecated keys
+      #   adds useful information about how to proceed with fixing handle_deprecations
+      #
+      # @return [void]
+      #
       def handle_deprecations
         DEPRECATED_KEYS.each do |old, new|
           next unless @options.key?(old)

data/lib/sidekiq_unique_jobs/lock_args.rb

@@ -111,6 +111,12 @@ module SidekiqUniqueJobs
         default_worker_options[UNIQUE_ARGS]
     end
 
+    #
+    # The globally default worker options configured from Sidekiq
+    #
+    #
+    # @return [Hash<String, Object>]
+    #
     def default_worker_options
       @default_worker_options ||= Sidekiq.default_worker_options.stringify_keys
     end

data/lib/sidekiq_unique_jobs/lock_config.rb

@@ -107,13 +107,13 @@ module SidekiqUniqueJobs
 
     # the strategy to use as conflict resolution from sidekiq client
     def on_client_conflict
-      @on_client_conflict ||= on_conflict&.(:[], :client) if on_conflict.is_a?(Hash)
+      @on_client_conflict ||= on_conflict[:client] if on_conflict.is_a?(Hash)
       @on_client_conflict ||= on_conflict
     end
 
     # the strategy to use as conflict resolution from sidekiq server
     def on_server_conflict
-      @on_client_conflict ||= on_conflict&.(:[], :server) if on_conflict.is_a?(Hash)
+      @on_server_conflict ||= on_conflict[:server] if on_conflict.is_a?(Hash)
       @on_server_conflict ||= on_conflict
     end
   end

data/lib/sidekiq_unique_jobs/lock_digest.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'openssl'
+require "openssl"
 
 module SidekiqUniqueJobs
   # Handles uniqueness of sidekiq arguments

data/lib/sidekiq_unique_jobs/locksmith.rb

@@ -52,7 +52,7 @@ module SidekiqUniqueJobs
     # @param [Hash] item a Sidekiq job hash
     # @option item [Integer] :lock_ttl the configured expiration
     # @option item [String] :jid the sidekiq job id
-    # @option item [String] :unique_digest the unique digest (See: {LockDigest#unique_digest})
+    # @option item [String] :unique_digest the unique digest (See: {LockDigest#lock_digest})
     # @param [Sidekiq::RedisConnection, ConnectionPool] redis_pool the redis connection
     #
     def initialize(item, redis_pool = nil)

data/lib/sidekiq_unique_jobs/lua/reap_orphans.lua

@@ -23,6 +23,7 @@ local redisversion = ARGV[6]
 <%= include_partial "shared/_common.lua" %>
 <%= include_partial "shared/_find_digest_in_queues.lua" %>
 <%= include_partial "shared/_find_digest_in_sorted_set.lua" %>
+<%= include_partial "shared/_find_digest_in_process_set.lua" %>
 ----------  END local functions ----------
 
 
@@ -61,6 +62,16 @@ repeat
       end
     end
 
+    -- TODO: Add check for jobs checked out by process
+    if found ~= true then
+      log_debug("Searching for digest:", digest, "in process sets")
+      local queue = find_digest_in_process_set(digest)
+      if queue then
+        log_debug("found digest:", digest, "in queue:", queue)
+        found = true
+      end
+    end
+
     if found ~= true then
       local queued     = digest .. ":QUEUED"
       local primed     = digest .. ":PRIMED"

data/lib/sidekiq_unique_jobs/lua/shared/_find_digest_in_process_set.lua

@@ -0,0 +1,35 @@
+local function find_digest_in_process_set(digest)
+  local process_cursor = 0
+  local job_cursor     = 0
+  local pattern        = "*" .. digest .. "*"
+  local found          = false
+
+  log_debug("searching in list processes:",
+            "for digest:", digest,
+            "cursor:", process_cursor)
+
+  repeat
+    local process_paginator   = redis.call("SSCAN", "processes", process_cursor, "MATCH", "*")
+    local next_process_cursor = process_paginator[1]
+    local processes           = process_paginator[2]
+    log_debug("Found number of processes:", #processes, "next cursor:", next_process_cursor)
+
+    for _, process in ipairs(processes) do
+      log_debug("searching in process set:", process,
+                "for digest:", digest,
+                "cursor:", process_cursor)
+
+      local job = redis.call("HGET", process, "info")
+
+      if string.find(job, digest) then
+        log_debug("Found digest", digest, "in process:", process)
+        found = true
+        break
+      end
+    end
+
+    process_cursor = next_process_cursor
+  until found == true or process_cursor == "0"
+
+  return found
+end

data/lib/sidekiq_unique_jobs/lua/shared/_find_digest_in_queues.lua

@@ -6,7 +6,7 @@ local function find_digest_in_queues(digest)
 
   repeat
     log_debug("searching all queues for a matching digest:", digest)
-    local pagination  = redis.call("SCAN", cursor, "MATCH", "*queue:*", "COUNT", count)
+    local pagination  = redis.call("SCAN", cursor, "MATCH", "queue:*", "COUNT", count)
     local next_cursor = pagination[1]
     local queues      = pagination[2]
 
@@ -34,12 +34,9 @@ local function find_digest_in_queues(digest)
         end
         index = index + per
       end
-
-      cursor = next_cursor
-      if cursor == "0" then
-        log_debug("Looped through all queues, stopping iteration")
-      end
     end
+
+    cursor = next_cursor
   until found == true or cursor == "0"
 
   return result

data/lib/sidekiq_unique_jobs/orphans/lua_reaper.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module SidekiqUniqueJobs
+  module Orphans
+    #
+    # Class DeleteOrphans provides deletion of orphaned digests
+    #
+    # @note this is a much slower version of the lua script but does not crash redis
+    #
+    # @author Mikael Henriksson <mikael@zoolutions.se>
+    #
+    class LuaReaper < Reaper
+      #
+      # Delete orphaned digests
+      #
+      #
+      # @return [Integer] the number of reaped locks
+      #
+      def call
+        call_script(
+          :reap_orphans,
+          conn,
+          keys: [DIGESTS, SCHEDULE, RETRY, PROCESSES],
+          argv: [reaper_count],
+        )
+      end
+    end
+  end
+end

data/lib/sidekiq_unique_jobs/orphans/reaper.rb

@@ -13,6 +13,17 @@ module SidekiqUniqueJobs
       include SidekiqUniqueJobs::Connection
       include SidekiqUniqueJobs::Script::Caller
       include SidekiqUniqueJobs::Logging
+      include SidekiqUniqueJobs::JSON
+
+      require_relative "lua_reaper"
+      require_relative "ruby_reaper"
+
+      #
+      # @return [Hash<Symbol, SidekiqUniqueJobs::Orphans::Reaper] the current implementation of reapers
+      REAPERS = {
+        lua: SidekiqUniqueJobs::Orphans::LuaReaper,
+        ruby: SidekiqUniqueJobs::Orphans::RubyReaper,
+      }.freeze
 
       #
       # Execute deletion of orphaned digests
@@ -27,7 +38,10 @@ module SidekiqUniqueJobs
         redis { |rcon| new(rcon).call }
       end
 
-      attr_reader :conn, :digests, :scheduled, :retried
+      #
+      # @!attribute [r] conn
+      #   @return [Redis] a redis connection
+      attr_reader :conn
 
       #
       # Initialize a new instance of DeleteOrphans
@@ -35,10 +49,7 @@ module SidekiqUniqueJobs
       # @param [Redis] conn a connection to redis
       #
       def initialize(conn)
-        @conn      = conn
-        @digests   = SidekiqUniqueJobs::Digests.new
-        @scheduled = Redis::SortedSet.new(SCHEDULE)
-        @retried   = Redis::SortedSet.new(RETRY)
+        @conn = conn
       end
 
       #
@@ -78,160 +89,12 @@ module SidekiqUniqueJobs
       # @return [Integer] the number of reaped locks
       #
       def call
-        case reaper
-        when :ruby
-          execute_ruby_reaper
-        when :lua
-          execute_lua_reaper
+        if (implementation = REAPERS[reaper])
+          implementation.new(conn).call
         else
           log_fatal(":#{reaper} is invalid for `SidekiqUnqiueJobs.config.reaper`")
         end
       end
-
-      #
-      # Executes the ruby reaper
-      #
-      #
-      # @return [Integer] the number of deleted locks
-      #
-      def execute_ruby_reaper
-        BatchDelete.call(orphans, conn)
-      end
-
-      #
-      # Executes the lua reaper
-      #
-      #
-      # @return [Integer] the number of deleted locks
-      #
-      def execute_lua_reaper
-        call_script(
-          :reap_orphans,
-          conn,
-          keys: [SidekiqUniqueJobs::DIGESTS, SidekiqUniqueJobs::SCHEDULE, SidekiqUniqueJobs::RETRY],
-          argv: [reaper_count],
-        )
-      end
-
-      #
-      # Find orphaned digests
-      #
-      #
-      # @return [Array<String>] an array of orphaned digests
-      #
-      def orphans
-        conn.zrevrange(digests.key, 0, -1).each_with_object([]) do |digest, result|
-          next if belongs_to_job?(digest)
-
-          result << digest
-          break if result.size >= reaper_count
-        end
-      end
-
-      #
-      # Checks if the digest has a matching job.
-      #   1. It checks the scheduled set
-      #   2. It checks the retry set
-      #   3. It goes through all queues
-      #
-      #
-      # @param [String] digest the digest to search for
-      #
-      # @return [true] when either of the checks return true
-      # @return [false] when no job was found for this digest
-      #
-      def belongs_to_job?(digest)
-        scheduled?(digest) || retried?(digest) || enqueued?(digest)
-      end
-
-      #
-      # Checks if the digest exists in the Sidekiq::ScheduledSet
-      #
-      # @param [String] digest the current digest
-      #
-      # @return [true] when digest exists in scheduled set
-      #
-      def scheduled?(digest)
-        in_sorted_set?(SCHEDULE, digest)
-      end
-
-      #
-      # Checks if the digest exists in the Sidekiq::RetrySet
-      #
-      # @param [String] digest the current digest
-      #
-      # @return [true] when digest exists in retry set
-      #
-      def retried?(digest)
-        in_sorted_set?(RETRY, digest)
-      end
-
-      #
-      # Checks if the digest exists in a Sidekiq::Queue
-      #
-      # @param [String] digest the current digest
-      #
-      # @return [true] when digest exists in any queue
-      #
-      def enqueued?(digest)
-        Sidekiq.redis do |conn|
-          queues(conn) do |queue|
-            entries(conn, queue) do |entry|
-              return true if entry.include?(digest)
-            end
-          end
-
-          false
-        end
-      end
-
-      #
-      # Loops through all the redis queues and yields them one by one
-      #
-      # @param [Redis] conn the connection to use for fetching queues
-      #
-      # @return [void]
-      #
-      # @yield queues one at a time
-      #
-      def queues(conn, &block)
-        conn.sscan_each("queues", &block)
-      end
-
-      def entries(conn, queue) # rubocop:disable Metrics/MethodLength
-        queue_key    = "queue:#{queue}"
-        initial_size = conn.llen(queue_key)
-        deleted_size = 0
-        page         = 0
-        page_size    = 50
-
-        loop do
-          range_start = page * page_size - deleted_size
-          range_end   = range_start + page_size - 1
-          entries     = conn.lrange(queue_key, range_start, range_end)
-          page       += 1
-
-          entries.each do |entry|
-            yield entry
-          end
-
-          deleted_size = initial_size - conn.llen(queue_key)
-        end
-      end
-
-      #
-      # Checks a sorted set for the existance of this digest
-      #
-      #
-      # @param [String] key the key for the sorted set
-      # @param [String] digest the digest to scan for
-      #
-      # @return [true] when found
-      # @return [false] when missing
-      #
-      def in_sorted_set?(key, digest)
-        conn.zscan_each(key, match: "*#{digest}*", count: 1).to_a.any?
-      end
     end
   end
 end

data/lib/sidekiq_unique_jobs/orphans/ruby_reaper.rb

@@ -0,0 +1,183 @@
+# frozen_string_literal: true
+
+module SidekiqUniqueJobs
+  module Orphans
+    #
+    # Class DeleteOrphans provides deletion of orphaned digests
+    #
+    # @note this is a much slower version of the lua script but does not crash redis
+    #
+    # @author Mikael Henriksson <mikael@zoolutions.se>
+    #
+    class RubyReaper < Reaper
+      #
+      # @!attribute [r] digests
+      #   @return [SidekiqUniqueJobs::Digests] digest collection
+      attr_reader :digests
+      #
+      # @!attribute [r] scheduled
+      #   @return [Redis::SortedSet] the Sidekiq ScheduleSet
+      attr_reader :scheduled
+      #
+      # @!attribute [r] retried
+      #   @return [Redis::SortedSet] the Sidekiq RetrySet
+      attr_reader :retried
+
+      #
+      # Initialize a new instance of DeleteOrphans
+      #
+      # @param [Redis] conn a connection to redis
+      #
+      def initialize(conn)
+        super(conn)
+        @digests   = SidekiqUniqueJobs::Digests.new
+        @scheduled = Redis::SortedSet.new(SCHEDULE)
+        @retried   = Redis::SortedSet.new(RETRY)
+      end
+
+      #
+      # Delete orphaned digests
+      #
+      #
+      # @return [Integer] the number of reaped locks
+      #
+      def call
+        BatchDelete.call(orphans, conn)
+      end
+
+      #
+      # Find orphaned digests
+      #
+      #
+      # @return [Array<String>] an array of orphaned digests
+      #
+      def orphans
+        conn.zrevrange(digests.key, 0, -1).each_with_object([]) do |digest, result|
+          next if belongs_to_job?(digest)
+
+          result << digest
+          break if result.size >= reaper_count
+        end
+      end
+
+      #
+      # Checks if the digest has a matching job.
+      #   1. It checks the scheduled set
+      #   2. It checks the retry set
+      #   3. It goes through all queues
+      #
+      #
+      # @param [String] digest the digest to search for
+      #
+      # @return [true] when either of the checks return true
+      # @return [false] when no job was found for this digest
+      #
+      def belongs_to_job?(digest)
+        scheduled?(digest) || retried?(digest) || enqueued?(digest) || active?(digest)
+      end
+
+      #
+      # Checks if the digest exists in the Sidekiq::ScheduledSet
+      #
+      # @param [String] digest the current digest
+      #
+      # @return [true] when digest exists in scheduled set
+      #
+      def scheduled?(digest)
+        in_sorted_set?(SCHEDULE, digest)
+      end
+
+      #
+      # Checks if the digest exists in the Sidekiq::RetrySet
+      #
+      # @param [String] digest the current digest
+      #
+      # @return [true] when digest exists in retry set
+      #
+      def retried?(digest)
+        in_sorted_set?(RETRY, digest)
+      end
+
+      #
+      # Checks if the digest exists in a Sidekiq::Queue
+      #
+      # @param [String] digest the current digest
+      #
+      # @return [true] when digest exists in any queue
+      #
+      def enqueued?(digest)
+        Sidekiq.redis do |conn|
+          queues(conn) do |queue|
+            entries(conn, queue) do |entry|
+              return true if entry.include?(digest)
+            end
+          end
+
+          false
+        end
+      end
+
+      def active?(digest)
+        Sidekiq.redis do |conn|
+          procs = conn.sscan_each("processes").to_a.sort
+
+          result = conn.pipelined do
+            procs.map do |key|
+              conn.hget(key, "info")
+            end
+          end
+
+          result.flatten.compact.any? { |job| load_json(job)[LOCK_DIGEST] == digest }
+        end
+      end
+
+      #
+      # Loops through all the redis queues and yields them one by one
+      #
+      # @param [Redis] conn the connection to use for fetching queues
+      #
+      # @return [void]
+      #
+      # @yield queues one at a time
+      #
+      def queues(conn, &block)
+        conn.sscan_each("queues", &block)
+      end
+
+      def entries(conn, queue) # rubocop:disable Metrics/MethodLength
+        queue_key    = "queue:#{queue}"
+        initial_size = conn.llen(queue_key)
+        deleted_size = 0
+        page         = 0
+        page_size    = 50
+
+        loop do
+          range_start = page * page_size - deleted_size
+          range_end   = range_start + page_size - 1
+          entries     = conn.lrange(queue_key, range_start, range_end)
+          page       += 1
+
+          entries.each do |entry|
+            yield entry
+          end
+
+          deleted_size = initial_size - conn.llen(queue_key)
+        end
+      end
+
+      #
+      # Checks a sorted set for the existance of this digest
+      #
+      #
+      # @param [String] key the key for the sorted set
+      # @param [String] digest the digest to scan for
+      #
+      # @return [true] when found
+      # @return [false] when missing
+      #
+      def in_sorted_set?(key, digest)
+        conn.zscan_each(key, match: "*#{digest}*", count: 1).to_a.any?
+      end
+    end
+  end
+end

data/lib/sidekiq_unique_jobs/version.rb

@@ -3,5 +3,5 @@
 module SidekiqUniqueJobs
   #
   # @return [String] the current SidekiqUniqueJobs version
-  VERSION = "7.0.0.beta14"
+  VERSION = "7.0.0.beta15"
 end

data/lib/sidekiq_unique_jobs/web.rb

@@ -2,7 +2,7 @@
 
 begin
   require "sidekiq/web"
-rescue LoadError # rubocop:disable Lint/SuppressedException
+rescue LoadError
   # client-only usage
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 7.0.0.beta14
+  version: 7.0.0.beta15
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brpoplpush-redis_script
@@ -294,7 +294,6 @@ files:
 - lib/sidekiq_unique_jobs/lua/delete_by_digest.lua
 - lib/sidekiq_unique_jobs/lua/delete_job_by_digest.lua
 - lib/sidekiq_unique_jobs/lua/find_digest_in_queues.lua
-- lib/sidekiq_unique_jobs/lua/find_digest_in_sorted_set.lua
 - lib/sidekiq_unique_jobs/lua/lock.lua
 - lib/sidekiq_unique_jobs/lua/locked.lua
 - lib/sidekiq_unique_jobs/lua/queue.lua
@@ -303,11 +302,11 @@ files:
 - lib/sidekiq_unique_jobs/lua/shared/_current_time.lua
 - lib/sidekiq_unique_jobs/lua/shared/_delete_from_queue.lua
 - lib/sidekiq_unique_jobs/lua/shared/_delete_from_sorted_set.lua
+- lib/sidekiq_unique_jobs/lua/shared/_find_digest_in_process_set.lua
 - lib/sidekiq_unique_jobs/lua/shared/_find_digest_in_queues.lua
 - lib/sidekiq_unique_jobs/lua/shared/_find_digest_in_sorted_set.lua
 - lib/sidekiq_unique_jobs/lua/shared/_hgetall.lua
 - lib/sidekiq_unique_jobs/lua/shared/_upgrades.lua
-- lib/sidekiq_unique_jobs/lua/shared/find_digest_in_sorted_set.lua
 - lib/sidekiq_unique_jobs/lua/unlock.lua
 - lib/sidekiq_unique_jobs/lua/update_version.lua
 - lib/sidekiq_unique_jobs/lua/upgrade.lua
@@ -324,9 +323,11 @@ files:
 - lib/sidekiq_unique_jobs/on_conflict/reschedule.rb
 - lib/sidekiq_unique_jobs/on_conflict/strategy.rb
 - lib/sidekiq_unique_jobs/options_with_fallback.rb
+- lib/sidekiq_unique_jobs/orphans/lua_reaper.rb
 - lib/sidekiq_unique_jobs/orphans/manager.rb
 - lib/sidekiq_unique_jobs/orphans/observer.rb
 - lib/sidekiq_unique_jobs/orphans/reaper.rb
+- lib/sidekiq_unique_jobs/orphans/ruby_reaper.rb
 - lib/sidekiq_unique_jobs/profiler.rb
 - lib/sidekiq_unique_jobs/redis.rb
 - lib/sidekiq_unique_jobs/redis/entity.rb

data/lib/sidekiq_unique_jobs/lua/find_digest_in_sorted_set.lua

@@ -1,24 +0,0 @@
-local function find_digest_in_sorted_set(name, digest)
-  local cursor  = 0
-  local count   = 5
-  local pattern = "*" .. digest .. "*"
-  local found   = false
-
-  log_debug("searching in:", name,
-            "for digest:", digest,
-            "cursor:", cursor)
-  repeat
-    local pagination  = redis.call("ZSCAN", name, cursor, "MATCH", pattern, "COUNT", count)
-    local next_cursor = pagination[1]
-    local items       = pagination[2]
-
-    if #items > 0 then
-      log_debug("Found digest", digest, "in zset:", name)
-      found = true
-    end
-
-    cursor = next_cursor
-  until found == true or cursor == "0"
-
-  return found
-end

data/lib/sidekiq_unique_jobs/lua/shared/find_digest_in_sorted_set.lua

@@ -1,24 +0,0 @@
-local function find_digest_in_sorted_set(name, digest)
-  local cursor  = 0
-  local count   = 5
-  local pattern = "*" .. digest .. "*"
-  local found   = false
-
-  log_debug("searching in:", name,
-            "for digest:", digest,
-            "cursor:", cursor)
-  repeat
-    local pagination  = redis.call("ZSCAN", name, cursor, "MATCH", pattern, "COUNT", count)
-    local next_cursor = pagination[1]
-    local items       = pagination[2]
-
-    if #items > 0 then
-      log_debug("Found digest", digest, "in sorted set:", name)
-      found = true
-    end
-
-    cursor = next_cursor
-  until found == true or cursor == "0"
-
-  return found
-end