Do not build keys on lua scripts

lib/sidekiq_unique_jobs/constants.rb

@@ -19,4 +19,6 @@ module SidekiqUniqueJobs
   ON_CONFLICT_KEY           ||= 'on_conflict'
   UNIQUE_ON_ALL_QUEUES_KEY  ||= 'unique_on_all_queues' # TODO: Remove in v6.1
   UNIQUE_PREFIX_KEY         ||= 'unique_prefix'
+  RETRY_SET                 ||= 'retry'
+  SCHEDULE_SET              ||= 'schedule'
 end

lib/sidekiq_unique_jobs/on_conflict/replace.rb

@@ -25,7 +25,11 @@ def call(&block)
 
       # Delete the job from either schedule, retry or the queue
       def delete_job_by_digest
-        Scripts.call(:delete_job_by_digest, nil, keys: [queue, unique_digest])
+        Scripts.call(
+          :delete_job_by_digest,
+          nil,
+          keys: ["#{QUEUE_KEY}:#{queue}", SCHEDULE_SET, RETRY_SET], argv: [unique_digest]
+        )
       end
 
       # Delete the keys belonging to the job

redis/delete_job_by_digest.lua

@@ -1,5 +1,7 @@
-local queue         = "queue:" .. KEYS[1]
-local unique_digest = KEYS[2]
+local queue         = KEYS[1]
+local schedule_set  = KEYS[2]
+local retry_set     = KEYS[3]
+local unique_digest = ARGV[1]
 
 local function delete_from_sorted_set(name, digest)
   local per   = 50
@@ -49,10 +51,10 @@ if result then
   return result
 end
 
-result = delete_from_sorted_set('schedule', unique_digest)
+result = delete_from_sorted_set(schedule_set, unique_digest)
 if result then
   return result
 end
 
-result = delete_from_sorted_set('retry', unique_digest)
+result = delete_from_sorted_set(retry_set, unique_digest)
 return result

spec/examples/my_unique_job_spec.rb

@@ -29,7 +29,7 @@
         described_class.perform_in(3600, 1, 2)
         expect(1).to be_enqueued_in('customqueue')
         expect(1).to be_enqueued_in('schedule')
-        expect(zcard('schedule')).to eq(1)
+        expect(schedule_count).to eq(1)
         expect(1).to be_scheduled_at(Time.now.to_f + 2 * 3600)
       end
 

spec/integration/sidekiq_unique_jobs/client/middleware_spec.rb

@@ -8,7 +8,7 @@
       jid = NotifyWorker.perform_in(1, 183, 'xxxx')
       expect(jid).not_to eq(nil)
 
-      expect(zcard('schedule')).to eq(1)
+      expect(schedule_count).to eq(1)
 
       expected = %w[
         uniquejobs:6e47d668ad22db2a3ba0afd331514ce2:EXISTS
@@ -23,7 +23,7 @@
       expect(SimpleWorker.perform_in(60, 1)).to eq(nil)
       expect(SimpleWorker.perform_in(60, 1)).to eq(nil)
       expect(SimpleWorker.perform_in(60, 1)).to eq(nil)
-      expect(zcard('schedule')).to eq(0)
+      expect(schedule_count).to eq(0)
       expect(SpawnSimpleWorker.perform_async(1)).not_to eq(nil)
 
       expect(queue_count('default')).to eq(1)