sidekiq-unique-jobs 7.1.28 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1891ac7a87d1169e9e78f9d1466d1f91971def15a48be2087e6781d6d3f37d5c
-  data.tar.gz: e17387346df0d54d972f0335ba06ce8fd67bd4727c447e70549ae8bcb2863b51
+  metadata.gz: 2101cca32c043a044df29b2bcd2d8ba58054aa6162d70bdf0f6b54e1237ad3fd
+  data.tar.gz: eed69a742091cc23d4362f258105be1175abe25f54058a4a83178f99820bef69
 SHA512:
-  metadata.gz: 885dd66133d98b1129423b8693051dba98c5dcc1becd7a58ab6a7175185122928cb7be829732b096443d3590f3362c2bfb7d852858e6045c89349b0aa74600ec
-  data.tar.gz: 16102f3d498afb409453407bf0f8fc9bd92ef2a93555cf2cccd91e4a09ba4b3e640d1384becd627339eed445d5ee2ad225f58a8ffb9be25032f137d04b9bc8ef
+  metadata.gz: 60691cad84cc2ed74ff2edf8d6028488dfcff10b5be4c360e91873785e824f1ddef6ea0a56ce3339bc1a96f745990eb52956a85c4e0d2fde1b9893b1de66d145
+  data.tar.gz: 5b5ca3b64971118236c984fea50de9cf010b9e848a7a2460d4b5c000e1e288c672775c149109f29d3b1efaef1485ccb0aedb5404da23a8f500b3e82a1af37563

data/CHANGELOG.md

@@ -1,13 +1,34 @@
 # Changelog
 
-## [Unreleased](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/HEAD)
+## [v7.1.29](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.1.29) (2022-12-03)
 
-[Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.27...HEAD)
+[Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.28...v7.1.29)
+
+**Fixed bugs:**
+
+- fix\(digests\): ensure consistent digests [\#743](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/743) ([mhenrixon](https://github.com/mhenrixon))
+
+**Merged pull requests:**
+
+- fix\(after\_unlock\): regression from \#707 [\#737](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/737) ([adamcreekroad](https://github.com/adamcreekroad))
+
+## [v7.1.28](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.1.28) (2022-11-28)
+
+[Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.27...v7.1.28)
 
 **Fixed bugs:**
 
 - Unique Jobs Not Running with Version 7.1.26  [\#730](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/730)
 
+**Closed issues:**
+
+- Error "undefined method `redis\_info' for Sidekiq:Module" on upgrade  [\#740](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/740)
+- spammed by `Nothing to delete; exiting` during spec [\#733](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/733)
+
+**Merged pull requests:**
+
+- sentence correction [\#744](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/744) ([SupriyaMedankar](https://github.com/SupriyaMedankar))
+
 ## [v7.1.27](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.1.27) (2022-07-30)
 
 [Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.26...v7.1.27)

data/lib/sidekiq_unique_jobs/batch_delete.rb

@@ -103,16 +103,12 @@ module SidekiqUniqueJobs
     def del_digest(pipeline, digest)
       removable_keys = keys_for_digest(digest)
 
-      if VersionCheck.satisfied?(redis_version, ">= 4.0.0")
-        pipeline.unlink(*removable_keys)
-      else
-        pipeline.del(*removable_keys)
-      end
+      pipeline.unlink(*removable_keys)
     end
 
     def keys_for_digest(digest)
       [digest, "#{digest}:RUN"].each_with_object([]) do |key, digest_keys|
-        digest_keys.concat([key])
+        digest_keys.push(key)
         digest_keys.concat(SUFFIXES.map { |suffix| "#{key}:#{suffix}" })
       end
     end

data/lib/sidekiq_unique_jobs/changelog.rb

@@ -7,13 +7,6 @@ module SidekiqUniqueJobs
   # @author Mikael Henriksson <mikael@mhenrixon.com>
   #
   class Changelog < Redis::SortedSet
-    #
-    # @return [Integer] the number of matches to return by default
-    DEFAULT_COUNT = 1_000
-    #
-    # @return [String] the default pattern to use for matching
-    SCAN_PATTERN  = "*"
-
     def initialize
       super(CHANGELOGS)
     end
@@ -42,12 +35,8 @@ module SidekiqUniqueJobs
     # @return [Array<Hash>] an array of entries
     #
     def entries(pattern: SCAN_PATTERN, count: DEFAULT_COUNT)
-      options = {}
-      options[:match] = pattern
-      options[:count] = count
-
       redis do |conn|
-        conn.zscan_each(key, **options).to_a.map { |entry| load_json(entry[0]) }
+        conn.zscan(key, match: pattern, count: count).to_a.map { |entry| load_json(entry[0]) }
       end
     end
 
@@ -67,10 +56,11 @@ module SidekiqUniqueJobs
           pipeline.zscan(key, cursor, match: pattern, count: page_size)
         end
 
+        # NOTE: When debugging, check the last item in the returned array.
         [
           total_size.to_i,
-          result[0].to_i, # next_cursor
-          result[1].map { |entry| load_json(entry[0]) }, # entries
+          result[0].to_i,  # next_cursor
+          result[1].map { |entry| load_json(entry) }.select { |entry| entry.is_a?(Hash) },
         ]
       end
     end

data/lib/sidekiq_unique_jobs/connection.rb

@@ -10,13 +10,10 @@ module SidekiqUniqueJobs
     end
 
     # Creates a connection to redis
-    # @return [Sidekiq::RedisConnection, ConnectionPool] a connection to redis
-    def redis(r_pool = nil, &block)
-      r_pool ||= defined?(redis_pool) ? redis_pool : r_pool
-      if r_pool
-        r_pool.with(&block)
-      else
-        Sidekiq.redis(&block)
+    # @return [Sidekiq::RedisConnection] a connection to redis
+    def redis(_r_pool = nil, &block)
+      Sidekiq.redis do |conn|
+        conn.with(&block)
       end
     end
   end

data/lib/sidekiq_unique_jobs/core_ext.rb

@@ -98,7 +98,7 @@ class Hash
     def _deep_transform_keys_in_object(object, &block)
       case object
       when Hash
-        object.each_with_object({}) do |(key, value), result|
+        object.each_with_object(self.class.new) do |(key, value), result|
           result[yield(key)] = _deep_transform_keys_in_object(value, &block)
         end
       when Array

data/lib/sidekiq_unique_jobs/digests.rb

@@ -7,13 +7,6 @@ module SidekiqUniqueJobs
   # @author Mikael Henriksson <mikael@mhenrixon.com>
   #
   class Digests < Redis::SortedSet
-    #
-    # @return [Integer] the number of matches to return by default
-    DEFAULT_COUNT = 1_000
-    #
-    # @return [String] the default pattern to use for matching
-    SCAN_PATTERN  = "*"
-
     def initialize(digests_key = DIGESTS)
       super(digests_key)
     end
@@ -77,11 +70,7 @@ module SidekiqUniqueJobs
     # @return [Array<String>] an array of digests matching the given pattern
     #
     def entries(pattern: SCAN_PATTERN, count: DEFAULT_COUNT)
-      options = {}
-      options[:match] = pattern
-      options[:count] = count
-
-      redis { |conn| conn.zscan_each(key, **options).to_a }.to_h
+      redis { |conn| conn.zscan(key, match: pattern, count: count).to_a }.to_h
     end
 
     #
@@ -100,6 +89,7 @@ module SidekiqUniqueJobs
           pipeline.zscan(key, cursor, match: pattern, count: page_size)
         end
 
+        # NOTE: When debugging, check the last item in the returned array.
         [
           total_size.to_i,
           digests[0].to_i, # next_cursor

data/lib/sidekiq_unique_jobs/lock_digest.rb

@@ -51,7 +51,7 @@ module SidekiqUniqueJobs
     # Creates a namespaced unique digest based on the {#digestable_hash} and the {#lock_prefix}
     # @return [String] a unique digest
     def create_digest
-      digest = OpenSSL::Digest::MD5.hexdigest(dump_json(digestable_hash))
+      digest = OpenSSL::Digest::MD5.hexdigest(dump_json(digestable_hash.sort))
       "#{lock_prefix}:#{digest}"
     end
 

data/lib/sidekiq_unique_jobs/locksmith.rb

@@ -240,7 +240,7 @@ module SidekiqUniqueJobs
     # @return [nil] when lock was not possible
     # @return [Object] whatever the block returns when lock was acquired
     #
-    def primed_async(conn, wait = nil, &block)
+    def primed_async(conn, wait = nil, &block) # rubocop:disable Metrics/MethodLength
       timeout = (wait || config.timeout).to_i
       timeout = 1 if timeout.zero?
 
@@ -248,8 +248,12 @@ module SidekiqUniqueJobs
       concurrent_timeout = add_drift(timeout)
 
       reflect(:debug, :timeouts, item,
-              timeouts: { brpoplpush_timeout: brpoplpush_timeout, concurrent_timeout: concurrent_timeout })
+              timeouts: {
+                brpoplpush_timeout: brpoplpush_timeout,
+                concurrent_timeout: concurrent_timeout,
+              })
 
+      # NOTE: When debugging, change .value to .value!
       primed_jid = Concurrent::Promises
                    .future(conn) { |red_con| pop_queued(red_con, timeout) }
                    .value
@@ -300,13 +304,8 @@ module SidekiqUniqueJobs
     def brpoplpush(conn, wait)
       # passing timeout 0 to brpoplpush causes it to block indefinitely
       raise InvalidArgument, "wait must be an integer" unless wait.is_a?(Integer)
-      return conn.brpoplpush(key.queued, key.primed, wait) if conn.class.to_s == "Redis::Namespace"
 
-      if VersionCheck.satisfied?(redis_version, ">= 6.2.0") && conn.respond_to?(:blmove)
-        conn.blmove(key.queued, key.primed, "RIGHT", "LEFT", timeout: wait)
-      else
-        conn.brpoplpush(key.queued, key.primed, timeout: wait)
-      end
+      conn.blmove(key.queued, key.primed, "RIGHT", "LEFT", wait)
     end
 
     #
@@ -356,7 +355,7 @@ module SidekiqUniqueJobs
     # @return [true, false]
     #
     def taken?(conn)
-      conn.hexists(key.locked, job_id)
+      conn.hexists(key.locked, job_id) != 0
     end
 
     def argv

data/lib/sidekiq_unique_jobs/lua/delete.lua

@@ -33,15 +33,12 @@ log_debug("BEGIN delete", digest)
 
 local redis_version  = toversion(redisversion)
 local count          = 0
-local del_cmd        = "DEL"
 
 log_debug("ZREM", digests, digest)
 count = count + redis.call("ZREM", digests, digest)
 
-if redis_version["major"] >= 4 then del_cmd = "UNLINK"; end
-
-log_debug(del_cmd, digest, queued, primed, locked, info)
-count = count + redis.call(del_cmd, digest, queued, primed, locked, info)
+log_debug("UNLINK", digest, queued, primed, locked, info)
+count = count + redis.call("UNLINK", digest, queued, primed, locked, info)
 
 
 log("Deleted (" .. count .. ") keys")

data/lib/sidekiq_unique_jobs/lua/delete_by_digest.lua

@@ -25,14 +25,11 @@ local redisversion = tostring(ARGV[5])
 --------  BEGIN delete_by_digest.lua --------
 local counter       = 0
 local redis_version = toversion(redisversion)
-local del_cmd       = "DEL"
 
 log_debug("BEGIN delete_by_digest:", digest)
 
-if redis_version["major"] >= 4 then del_cmd = "UNLINK"; end
-
-log_debug(del_cmd, digest, queued, primed, locked, run_digest, run_queued, run_primed, run_locked)
-counter = redis.call(del_cmd, digest, queued, primed, locked, run_digest, run_queued, run_primed, run_locked)
+log_debug("UNLINK", digest, queued, primed, locked, run_digest, run_queued, run_primed, run_locked)
+counter = redis.call("UNLINK", digest, queued, primed, locked, run_digest, run_queued, run_primed, run_locked)
 
 log_debug("ZREM", digests, digest)
 redis.call("ZREM", digests, digest)

data/lib/sidekiq_unique_jobs/lua/reap_orphans.lua

@@ -37,9 +37,6 @@ local total     = redis.call("ZCARD", digests_set)
 local index     = 0
 local del_count = 0
 local redis_ver = toversion(redisversion)
-local del_cmd   = "DEL"
-
-if tonumber(redis_ver["major"]) >= 4 then del_cmd = "UNLINK"; end
 
 repeat
   log_debug("Interating through:", digests_set, "for orphaned locks")
@@ -81,7 +78,7 @@ repeat
       local run_locked = digest .. ":RUN:LOCKED"
       local run_info   = digest .. ":RUN:INFO"
 
-      redis.call(del_cmd, digest, queued, primed, locked, info, run_digest, run_queued, run_primed, run_locked, run_info)
+      redis.call("UNLINK", digest, queued, primed, locked, info, run_digest, run_queued, run_primed, run_locked, run_info)
 
       redis.call("ZREM", digests_set, digest)
       del_count = del_count + 1
@@ -108,7 +105,7 @@ if del_count < reaper_count then
       local run_locked = digest .. ":RUN:LOCKED"
       local run_info   = digest .. ":RUN:INFO"
 
-      redis.call(del_cmd, digest, queued, primed, locked, info, run_digest, run_queued, run_primed, run_locked, run_info)
+      redis.call("UNLINK", digest, queued, primed, locked, info, run_digest, run_queued, run_primed, run_locked, run_info)
 
       redis.call("ZREM", expiring_digests_set, digest)
       del_count = del_count + 1

data/lib/sidekiq_unique_jobs/lua/shared/_delete_from_sorted_set.lua

@@ -3,6 +3,7 @@ local function delete_from_sorted_set(name, digest)
   local total = redis.call("zcard", name)
   local index = 0
   local result
+
   while (index < total) do
     local items = redis.call("ZRANGE", name, index, index + per -1)
     for _, item in pairs(items) do

data/lib/sidekiq_unique_jobs/lua/unlock.lua

@@ -66,13 +66,10 @@ log_debug("LREM", primed, -1, job_id)
 redis.call("LREM", primed, -1, job_id)
 
 local redis_version = toversion(redisversion)
-local del_cmd       = "DEL"
-
-if tonumber(redis_version["major"]) >= 4 then del_cmd =  "UNLINK"; end
 
 if lock_type ~= "until_expired" then
-  log_debug(del_cmd, digest, info)
-  redis.call(del_cmd, digest, info)
+  log_debug("UNLINK", digest, info)
+  redis.call("UNLINK", digest, info)
 
   log_debug("HDEL", locked, job_id)
   redis.call("HDEL", locked, job_id)
@@ -81,13 +78,13 @@ end
 local locked_count = redis.call("HLEN", locked)
 
 if locked_count and locked_count < 1 then
-  log_debug(del_cmd, locked)
-  redis.call(del_cmd, locked)
+  log_debug("UNLINK", locked)
+  redis.call("UNLINK", locked)
 end
 
 if redis.call("LLEN", primed) == 0 then
-  log_debug(del_cmd, primed)
-  redis.call(del_cmd, primed)
+  log_debug("UNLINK", primed)
+  redis.call("UNLINK", primed)
 end
 
 if limit and limit <= 1 and locked_count and locked_count <= 1 then

data/lib/sidekiq_unique_jobs/lua/upgrade.lua

@@ -22,9 +22,7 @@ local new_version   = redis.call("GET", live_version)
 local old_version   = redis.call("GET", dead_version)
 local redis_version = toversion(redisversion)
 local upgraded      = 0
-local del_cmd       = "DEL"
 
-if redis_version["major"] >= 4 then del_cmd = "UNLINK"; end
 --------  BEGIN delete.lua --------
 
 log_debug("BEGIN upgrading from: ", old_version, "to:", new_version)

data/lib/sidekiq_unique_jobs/middleware.rb

@@ -32,7 +32,7 @@ module SidekiqUniqueJobs
       @item       = item
       @queue      = queue
       @redis_pool = redis_pool
-      self.job_class = item[CLASS]
+      self.job_class = worker_class
       return yield if unique_disabled?
 
       SidekiqUniqueJobs::Job.prepare(item) unless item[LOCK_DIGEST]

data/lib/sidekiq_unique_jobs/on_conflict/reject.rb

@@ -12,33 +12,6 @@ module SidekiqUniqueJobs
       def call
         log_info { "Adding dead #{item[CLASS]} job #{item[JID]}" }
 
-        if deadset_kill?
-          deadset_kill
-        else
-          push_to_deadset
-        end
-      end
-
-      #
-      # Sidekiq version compatibility check
-      # @api private
-      #
-      #
-      # @return [true, false] depending on if Sidekiq::Deadset responds to kill
-      #
-      def deadset_kill?
-        deadset.respond_to?(:kill)
-      end
-
-      #
-      # Use Sidekiqs built in Sidekiq::DeadSet#kill
-      #   to get rid of the job
-      # @api private
-      #
-      #
-      # @return [void]
-      #
-      def deadset_kill
         if kill_with_options?
           kill_job_with_options
         else
@@ -88,22 +61,6 @@ module SidekiqUniqueJobs
         @deadset ||= Sidekiq::DeadSet.new
       end
 
-      #
-      # Used for compatibility with older Sidekiq versions
-      #
-      #
-      # @return [void]
-      #
-      def push_to_deadset
-        redis do |conn|
-          conn.multi do |pipeline|
-            pipeline.zadd("dead", now_f, payload)
-            pipeline.zremrangebyscore("dead", "-inf", now_f - Sidekiq::DeadSet.timeout)
-            pipeline.zremrangebyrank("dead", 0, -Sidekiq::DeadSet.max_jobs)
-          end
-        end
-      end
-
       #
       # The Sidekiq job hash as JSON
       #

data/lib/sidekiq_unique_jobs/orphans/ruby_reaper.rb

@@ -79,11 +79,7 @@ module SidekiqUniqueJobs
       def expired_digests
         max_score = (start_time - reaper_timeout).to_f
 
-        if VersionCheck.satisfied?(redis_version, ">= 6.2.0") && VersionCheck.satisfied?(::Redis::VERSION, ">= 4.6.0")
-          conn.zrange(EXPIRING_DIGESTS, 0, max_score, byscore: true)
-        else
-          conn.zrangebyscore(EXPIRING_DIGESTS, 0, max_score)
-        end
+        conn.zrange(EXPIRING_DIGESTS, 0, max_score, byscore: true)
       end
 
       #
@@ -184,7 +180,7 @@ module SidekiqUniqueJobs
 
       def active?(digest) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         Sidekiq.redis do |conn|
-          procs = conn.sscan_each("processes").to_a
+          procs = conn.sscan("processes").to_a
           return false if procs.empty?
 
           procs.sort.each do |key|
@@ -235,7 +231,7 @@ module SidekiqUniqueJobs
       # @yield queues one at a time
       #
       def queues(conn, &block)
-        conn.sscan_each("queues", &block)
+        conn.sscan("queues").each(&block)
       end
 
       def entries(conn, queue, &block) # rubocop:disable Metrics/MethodLength
@@ -290,7 +286,7 @@ module SidekiqUniqueJobs
       # @return [false] when missing
       #
       def in_sorted_set?(key, digest)
-        conn.zscan_each(key, match: "*#{digest}*", count: 1).to_a.any?
+        conn.zscan(key, match: "*#{digest}*", count: 1).to_a.any?
       end
     end
     # rubocop:enable Metrics/ClassLength

data/lib/sidekiq_unique_jobs/redis/sorted_set.rb

@@ -8,6 +8,13 @@ module SidekiqUniqueJobs
     # @author Mikael Henriksson <mikael@mhenrixon.com>
     #
     class SortedSet < Entity
+      #
+      # @return [Integer] the number of matches to return by default
+      DEFAULT_COUNT = 1_000
+      #
+      # @return [String] the default pattern to use for matching
+      SCAN_PATTERN  = "*"
+
       #
       # Return entries for this sorted set
       #
@@ -17,7 +24,7 @@ module SidekiqUniqueJobs
       # @return [Hash] when given with_scores: true
       #
       def entries(with_scores: true)
-        entrys = redis { |conn| conn.zrange(key, 0, -1, with_scores: with_scores) }
+        entrys = redis { |conn| conn.zrange(key, 0, -1, withscores: with_scores) }
         return entrys unless with_scores
 
         entrys.each_with_object({}) { |pair, hash| hash[pair[0]] = pair[1] }
@@ -33,7 +40,7 @@ module SidekiqUniqueJobs
       def add(values)
         redis do |conn|
           if values.is_a?(Array)
-            conn.zadd(key, values)
+            conn.zadd(key, *values)
           else
             conn.zadd(key, now_f, values)
           end

data/lib/sidekiq_unique_jobs/reflections.rb

@@ -50,7 +50,7 @@ module SidekiqUniqueJobs
     #
     # @return [void] <description>
     #
-    def dispatch(reflection, *args)
+    def dispatch(reflection, *args) # rubocop:disable Metrics/MethodLength
       if (block = @reflections[reflection])
         block.call(*args)
 

data/lib/sidekiq_unique_jobs/script/caller.rb

@@ -54,14 +54,9 @@ module SidekiqUniqueJobs
       # Only used to reduce a little bit of duplication
       # @see call_script
       def do_call(file_name, conn, keys, argv)
-        argv = argv.dup.concat([
-                                 now_f,
-                                 debug_lua,
-                                 max_history,
-                                 file_name,
-                                 redis_version,
-                               ])
-        Script.execute(file_name, conn, keys: keys, argv: argv)
+        argv = argv.dup.push(now_f, debug_lua, max_history, file_name, redis_version)
+
+        Script.execute(file_name, conn, keys: keys, argv: normalize_argv(argv))
       end
 
       #
@@ -122,6 +117,17 @@ module SidekiqUniqueJobs
       def redis_version
         SidekiqUniqueJobs.config.redis_version
       end
+
+      def normalize_argv(argv)
+        argv.each_with_index do |item, index|
+          case item
+          when FalseClass, NilClass
+            argv[index] = 0
+          when TrueClass
+            argv[index] = 1
+          end
+        end
+      end
     end
   end
 end

data/lib/sidekiq_unique_jobs/server.rb

@@ -33,7 +33,6 @@ module SidekiqUniqueJobs
     #
     def self.start
       SidekiqUniqueJobs::UpdateVersion.call
-      SidekiqUniqueJobs::UpgradeLocks.call
       SidekiqUniqueJobs::Orphans::Manager.start
       SidekiqUniqueJobs::Orphans::ReaperResurrector.start
     end

data/lib/sidekiq_unique_jobs/sidekiq_unique_jobs.rb

@@ -198,7 +198,7 @@ module SidekiqUniqueJobs # rubocop:disable Metrics/ModuleLength
   # @return [String] a string like `5.0.2`
   #
   def fetch_redis_version
-    Sidekiq.redis_info["redis_version"]
+    Sidekiq.default_configuration.redis_info["redis_version"]
   end
 
   #

data/lib/sidekiq_unique_jobs/upgrade_locks.rb

@@ -6,7 +6,7 @@ module SidekiqUniqueJobs
   #
   # @author Mikael Henriksson <mikael@mhenrixon.com>
   #
-  class UpgradeLocks # rubocop:disable Metrics/ClassLength
+  class UpgradeLocks
     #
     # @return [Integer] the number of keys to batch upgrade
     BATCH_SIZE = 100
@@ -56,9 +56,9 @@ module SidekiqUniqueJobs
 
         log_info("Start - Upgrading Locks")
 
-        upgrade_v6_locks
-        delete_unused_v6_keys
-        delete_supporting_v6_keys
+        # upgrade_v6_locks
+        # delete_unused_v6_keys
+        # delete_supporting_v6_keys
 
         conn.hset(upgraded_key, version, now_f)
         log_info("Done - Upgrading Locks")
@@ -75,10 +75,11 @@ module SidekiqUniqueJobs
 
     def upgrade_v6_locks
       log_info("Start - Converting v6 locks to v7")
-      conn.scan_each(match: "*:GRABBED", count: BATCH_SIZE) do |grabbed_key|
+      conn.scan(match: "*:GRABBED", count: BATCH_SIZE).each do |grabbed_key|
         upgrade_v6_lock(grabbed_key)
         @count += 1
       end
+
       log_info("Done - Converting v6 locks to v7")
     end
 
@@ -115,11 +116,7 @@ module SidekiqUniqueJobs
       return if keys.empty?
 
       conn.pipelined do |pipeline|
-        if VersionCheck.satisfied?(redis_version, ">= 4.0.0")
-          pipeline.unlink(*keys)
-        else
-          pipeline.del(*keys)
-        end
+        pipeline.unlink(*keys)
       end
     end
 

data/lib/sidekiq_unique_jobs/version.rb

@@ -3,5 +3,5 @@
 module SidekiqUniqueJobs
   #
   # @return [String] the current SidekiqUniqueJobs version
-  VERSION = "7.1.28"
+  VERSION = "8.0.0"
 end

data/lib/sidekiq_unique_jobs/web/helpers.rb

@@ -80,11 +80,11 @@ module SidekiqUniqueJobs
       #
       def cparams(options)
         stringified_options = options.transform_keys(&:to_s)
-        params.merge(stringified_options).map do |key, value|
+        params.merge(stringified_options).filter_map do |key, value|
           next unless SAFE_CPARAMS.include?(key)
 
           "#{key}=#{CGI.escape(value.to_s)}"
-        end.compact.join("&")
+        end.join("&")
       end
 
       #

data/lib/sidekiq_unique_jobs/web/views/changelogs.erb

@@ -1,54 +1,60 @@
 <header class="row">
   <div class="col-sm-5">
     <h3>
-    <%= t('Changelog Entries') %>
+      <%= t('Changelog Entries') %>
     </h3>
   </div>
   <form action="<%= root_path %>changelogs" class="form form-inline" method="get">
     <%= csrf_tag %>
+
     <input name="filter" class="form-control" type="text" value="<%= @filter %>" />
+
     <button class="btn btn-default" type="submit">
-    <%= t('Filter') %>
+      <%= t('Filter') %>
     </button>
   </form>
+
   <% if @changelogs.any? && @total_size > @count.to_i %>
-  <div class="col-sm-4">
-    <%= erb unique_template(:_paging), locals: { url: "#{root_path}changelogs" } %>
-  </div>
+    <div class="col-sm-4">
+      <%= erb unique_template(:_paging), locals: { url: "#{root_path}changelogs" } %>
+    </div>
   <% end %>
 </header>
+
 <% if @changelogs.any? %>
-<div class="table_container">
-  <form action="<%= root_path %>changelogs/delete_all" method="get">
-    <input class="btn btn-danger btn-xs" type="submit" name="delete_all" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
-  </form>
-  <br/>
-  <table class="table table-striped table-bordered table-hover">
-    <thead>
-      <tr>
-        <th><%= t('Time') %></th>
-        <th><%= t('Digest') %></th>
-        <th><%= t('Script') %></th>
-        <th><%= t('JID') %></th>
-        <th><%= t('Prev JID') %></th>
-        <th><%= t('Message') %></th>
-      </tr>
-    </thead>
-    <tbody>
-    <% @changelogs.each do |changelog| %>
-      <tr  class="changelog-row">
-        <td><%= safe_relative_time(changelog["time"]) %></td>
-        <td><%= changelog["digest"] %></td>
-        <td><%= changelog["script"] %></td>
-        <td><%= changelog["job_id"] %></td>
-        <td><%= changelog["prev_jid"] %></td>
-        <td><%= changelog["message"] %></th>
-      </tr>
-    <% end %>
-    </tbody>
-  </table>
-  <form action="<%= root_path %>changelogs/delete_all" method="get">
-    <input class="btn btn-danger btn-xs" type="submit" name="delete_all" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
-  </form>
-</div>
+  <div class="table_container">
+    <form action="<%= root_path %>changelogs/delete_all" method="get">
+      <input class="btn btn-danger btn-xs" type="submit" name="delete_all" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+    </form>
+    <br/>
+
+    <table class="table table-striped table-bordered table-hover">
+      <thead>
+        <tr>
+          <th><%= t('Time') %></th>
+          <th><%= t('Digest') %></th>
+          <th><%= t('Script') %></th>
+          <th><%= t('JID') %></th>
+          <th><%= t('Prev JID') %></th>
+          <th><%= t('Message') %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @changelogs.each do |changelog| %>
+          <tr  class="changelog-row">
+            <td><%= "bogus" %></td>
+            <td><%= changelog["digest"] %></td>
+            <td><%= changelog["script"] %></td>
+            <td><%= changelog["job_id"] %></td>
+            <td><%= changelog["prev_jid"] %></td>
+            <td><%= changelog["message"] %></th>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+
+    <form action="<%= root_path %>changelogs/delete_all" method="get">
+      <input class="btn btn-danger btn-xs" type="submit" name="delete_all" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+    </form>
+  </div>
 <% end %>

data/lib/sidekiq_unique_jobs/web/views/locks.erb

@@ -7,48 +7,53 @@
   <form action="<%= root_path %>locks" class="form form-inline" method="get">
     <%= csrf_tag %>
     <input name="filter" class="form-control" type="text" value="<%= @filter %>" />
+
     <button class="btn btn-default" type="submit">
-    <%= t('Filter') %>
+      <%= t('Filter') %>
     </button>
+
   </form>
+
   <% if @locks.any? && @total_size > @count %>
-  <div class="col-sm-4">
-    <%= erb unique_template(:_paging), locals: { url: "#{root_path}locks" } %>
-  </div>
+    <div class="col-sm-4">
+      <%= erb unique_template(:_paging), locals: { url: "#{root_path}locks" } %>
+    </div>
   <% end %>
 </header>
+
 <% if @locks.any? %>
-<div class="table_container">
-  <table class="table table-striped table-bordered table-hover">
-    <thead>
-      <tr>
-        <th><%= t('Delete') %></th>
-        <th><%= t('Digest') %></th>
-        <th><%= t('Lock') %></th>
-        <th><%= t('Locks') %></th>
-        <th><%= t('Since') %></th>
-      </tr>
-    </thead>
-    <% @locks.each do |lock| %>
-    <tbody>
-      <tr class="lock-row">
-        <td>
-          <form action="<%= root_path %>locks/<%= lock.key %>/delete" method="get">
-            <%= csrf_tag %>
-            <input name="lock" value="<%= h lock.key %>" type="hidden" />
-            <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
-          </form>
-        </td>
-        <td><a href="<%= root_path %>locks/<%= lock.key %>"><%= lock.key %></a></td>
-        <td><%= lock.info["lock"] %></td>
-        <td><%= lock.locked.count %></td>
-        <td><%= safe_relative_time(lock.created_at) %></td>
-      </tr>
-    </tbody>
-    <% end %>
-</table>
-<form action="<%= root_path %>locks/delete_all" method="get">
-  <input class="btn btn-danger btn-xs" type="submit" name="delete_all" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
-</form>
-</div>
+  <div class="table_container">
+    <table class="table table-striped table-bordered table-hover">
+      <thead>
+        <tr>
+          <th><%= t('Delete') %></th>
+          <th><%= t('Digest') %></th>
+          <th><%= t('Lock') %></th>
+          <th><%= t('Locks') %></th>
+          <th><%= t('Since') %></th>
+        </tr>
+      </thead>
+      <% @locks.each do |lock| %>
+        <tbody>
+          <tr class="lock-row">
+            <td>
+              <form action="<%= root_path %>locks/<%= lock.key %>/delete" method="get">
+                <%= csrf_tag %>
+                <input name="lock" value="<%= h lock.key %>" type="hidden" />
+                <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
+              </form>
+            </td>
+            <td><a href="<%= root_path %>locks/<%= lock.key %>"><%= lock.key %></a></td>
+            <td><%= lock.info["lock"] %></td>
+            <td><%= lock.locked.count %></td>
+            <td><%= safe_relative_time(lock.created_at) %></td>
+          </tr>
+        </tbody>
+      <% end %>
+    </table>
+
+    <form action="<%= root_path %>locks/delete_all" method="get">
+      <input class="btn btn-danger btn-xs" type="submit" name="delete_all" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+    </form>
+  </div>
 <% end %>

data/lib/sidekiq_unique_jobs/web.rb

@@ -5,7 +5,6 @@ require_relative "web/helpers"
 module SidekiqUniqueJobs
   # Utility module to help manage unique keys in redis.
   # Useful for deleting keys that for whatever reason wasn't deleted
-  #
   # @author Mikael Henriksson <mikael@mhenrixon.com>
   module Web
     def self.registered(app) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
@@ -17,8 +16,8 @@ module SidekiqUniqueJobs
         @filter         = params[:filter] || "*"
         @filter         = "*" if @filter == ""
         @count          = (params[:count] || 100).to_i
-        @current_cursor = params[:cursor]
-        @prev_cursor    = params[:prev_cursor]
+        @current_cursor = params[:cursor].to_i
+        @prev_cursor    = params[:prev_cursor].to_i
         @total_size, @next_cursor, @changelogs = changelog.page(
           cursor: @current_cursor,
           pattern: @filter,
@@ -37,8 +36,8 @@ module SidekiqUniqueJobs
         @filter         = params[:filter] || "*"
         @filter         = "*" if @filter == ""
         @count          = (params[:count] || 100).to_i
-        @current_cursor = params[:cursor]
-        @prev_cursor    = params[:prev_cursor]
+        @current_cursor = params[:cursor].to_i
+        @prev_cursor    = params[:prev_cursor].to_i
 
         @total_size, @next_cursor, @locks = digests.page(
           cursor: @current_cursor,
@@ -53,8 +52,8 @@ module SidekiqUniqueJobs
         @filter         = params[:filter] || "*"
         @filter         = "*" if @filter == ""
         @count          = (params[:count] || 100).to_i
-        @current_cursor = params[:cursor]
-        @prev_cursor    = params[:prev_cursor]
+        @current_cursor = params[:cursor].to_i
+        @prev_cursor    = params[:prev_cursor].to_i
 
         @total_size, @next_cursor, @locks = expiring_digests.page(
           cursor: @current_cursor,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 7.1.28
+  version: 8.0.0
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-03 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brpoplpush-redis_script
@@ -56,27 +56,27 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -86,7 +86,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -218,33 +218,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: |
-  IMPORTANT!
-
-  Automatic configuration of the sidekiq middleware is no longer done.
-  Please see: https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/README.md#add-the-middleware
-
-  This version deprecated the following sidekiq_options
-
-    - sidekiq_options lock_args: :method_name
-
-  It is now configured with:
-
-    - sidekiq_options lock_args_method: :method_name
-
-  This is also true for `Sidekiq.default_worker_options`
-
-  We also deprecated the global configuration options:
-    - default_lock_ttl
-    - default_lock_ttl=
-    - default_lock_timeout
-    - default_lock_timeout=
-
-  The new methods to use are:
-    - lock_ttl
-    - lock_ttl=
-    - lock_timeout
-    - lock_timeout=
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -252,14 +226,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.2
 signing_key:
 specification_version: 4
 summary: Sidekiq middleware that prevents duplicates jobs