Drop jobs hash

CHANGELOG.md

@@ -10,6 +10,7 @@
 - Renamed `UntilTimeout` to `UntilExpired`
 - Removed concurrency for now (a0cff5bc42edbe7190d6ede7e7f845074d2d7af6)
 - Improved integration testing for locks
+- Totally delete the hash that was growing out of proportion
 
 ## v5.1.0
 

redis/delete.lua

@@ -2,10 +2,11 @@ local exists_key    = KEYS[1]
 local grabbed_key   = KEYS[2]
 local available_key = KEYS[3]
 local version_key   = KEYS[4]
-local unique_digest = KEYS[5] -- TODO: Legacy support (Remove in v6.1)
+local unique_digest = KEYS[5]     -- TODO: Legacy support (Remove in v6.1)
 
 redis.call('DEL', exists_key)
 redis.call('DEL', grabbed_key)
 redis.call('DEL', available_key)
 redis.call('DEL', version_key)
-redis.call('DEL', unique_digest) -- TODO: Legacy support (Remove in v6.1)
+redis.call('DEL', 'uniquejobs')   -- TODO: Old job hash, just drop the darn thing
+redis.call('DEL', unique_digest)  -- TODO: Legacy support (Remove in v6.1)

redis/release_lock.lua

@@ -5,7 +5,7 @@ local stored_jid = redis.pcall('get', unique_key)
 if stored_jid then
   if stored_jid == job_id or stored_jid == '2' then
     redis.pcall('del', unique_key)
-    redis.pcall('hdel', 'uniquejobs', job_id)
+    redis.pcall('HDEL', 'uniquejobs', job_id)
     return 1
   else
     return 0

spec/integration/sidekiq_unique_jobs/legacy_lock_spec.rb

@@ -28,6 +28,25 @@
   let(:locksmith_two) { described_class.new(lock_item_two) }
   let(:lock_item_two) { lock_item.merge('jid' => jid_two) }
 
+  context 'with a legacy uniquejobs hash' do
+    before do
+      SidekiqUniqueJobs.redis do |conn|
+        conn.multi do
+          conn.hset('uniquejobs', 'bogus', 'value')
+          conn.hset('uniquejobs', 'bogus', 'value 2')
+        end
+      end
+    end
+
+    it 'deletes the uniquejobs hash' do
+      expect(keys).to include('uniquejobs')
+      expect(hexists('uniquejobs', 'bogus')).to eq(true)
+      locksmith_one.delete
+      expect(keys).not_to include('uniquejobs')
+      expect(hexists('uniquejobs', 'bogus')).to eq(false)
+    end
+  end
+
   context 'with a legacy lock' do
     before do
       result = SidekiqUniqueJobs::Scripts.call(

spec/support/sidekiq_helpers.rb

@@ -11,6 +11,14 @@ def zcount(queue, time)
     redis { |conn| conn.zcount(queue, -1, time) }
   end
 
+  def hexists(hash, key)
+    redis { |conn| conn.hexists(hash, key) }
+  end
+
+  def hlen(hash, key)
+    redis { |conn| conn.hlen(hash, key) }
+  end
+
   def get_key(key)
     redis { |conn| conn.get(key) }
   end