sidekiq-unique-jobs 4.0.12 → 4.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ad145a74f603f0fb35ab336670b69de2f4d15f5
-  data.tar.gz: a3f37457af73e6256eb1dbcfa5f6a5ac36c4d0b7
+  metadata.gz: a667c02accea5b2f80e5ba1b193386a416d15453
+  data.tar.gz: c8e813d81b96efc50d1870d32e7c9b3e257ffb63
 SHA512:
-  metadata.gz: ae02108f28fef4e4270b0b37c836191214b18c9e47b34ba5f7a6c0e748f7bf1c9cff5a9f4e9c9fde5deac0163b4e541eb127fe8f05cc2b68ef932e8ae79c3d57
-  data.tar.gz: 1e107f3d113d99d6e9e0c11e8f98718c782bfd7141a6b613eb2b295e1fb64caa205d97aeaf606b245bb9c0bf6cf42791330f22404ef9de9cbffb5bd560acc647
+  metadata.gz: 30cf3f31dee1a248da9541e8fa7fc4f775f7082919b7baba93c89d013a62fef10450dd882ed726ed1c4af98962ee9995a2df58e8549f5270464b48b51dcb9545
+  data.tar.gz: d18f162f26b71b9a1ab2b8e865ad8da609ea43e993306f46714e7bd289aaea883724a2a2e72e65611fd22aaab4e5ad3d01673b4b412439339cfa9cda53c9221d

data/.travis.yml

@@ -32,3 +32,6 @@ matrix:
     - rvm: 2.2.3
       gemfile: gemfiles/sidekiq_develop.gemfile
       env: STYLE=true
+addons:
+  code_climate:
+    repo_token: 88e524e8f638efe690def7a6e2c72b1a9db5cdfa74548921b734d609a5858ee5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v4.0.13
+
+- Allow deleting locks by jid
+
 ## v4.0.12
 
 - Allow jobs to be pushed to processing

data/bin/bench

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+# Trap interrupts to quit cleanly. See
+# https://twitter.com/mitchellh/status/283014103189053442
+Signal.trap('INT') { abort }
+
+require 'bundler/setup'
+require 'benchmark/ips'
+require 'sidekiq-unique-jobs'
+
+ITERATIONS ||= 10_000
+
+Benchmark.ips do |x|
+  x.config(time: 5, warmup: 2)
+  x.report('new_shit') do |_times|
+    SidekiqUniqueJobs::Scripts.call(:aquire_lock, nil, keys: [SecureRandom.hex], argv: [SecureRandom.hex])
+  end
+  x.compare!
+end

data/lib/sidekiq_unique_jobs/options_with_fallback.rb

@@ -26,13 +26,23 @@ module SidekiqUniqueJobs
     end
 
     def unique_lock
-      if options.key?(UNIQUE_KEY) && options[UNIQUE_KEY] == true
-        warn('unique: true is no longer valid. Please set it to the type of lock required like: ' \
-             '`unique: :until_executed`')
-        options[UNIQUE_LOCK_KEY] || SidekiqUniqueJobs.default_lock
-      else
-        options[UNIQUE_KEY] || item[UNIQUE_KEY] || SidekiqUniqueJobs.default_lock
-      end
+      @unique_lock ||=
+        if options.key?(UNIQUE_KEY) && options[UNIQUE_KEY].to_s == 'true'
+          warn('unique: true is no longer valid. Please set it to the type of lock required like: ' \
+               '`unique: :until_executed`')
+          options[UNIQUE_LOCK_KEY] || SidekiqUniqueJobs.default_lock
+        else
+          lock_type || SidekiqUniqueJobs.default_lock
+        end
+    end
+
+    def lock_type
+      lock_type_from(options) || lock_type_from(item)
+    end
+
+    def lock_type_from(hash, key = UNIQUE_KEY)
+      return nil if hash[key].is_a?(TrueClass)
+      hash[key]
     end
 
     def options

data/lib/sidekiq_unique_jobs/unlockable.rb

@@ -13,7 +13,7 @@ module SidekiqUniqueJobs
     end
 
     def unlock_by_jid(jid, redis_pool = nil)
-      Scripts.call(:release_lock, redis_pool, keys: [unique_key], argv: [jid]) do |result|
+      Scripts.call(:release_lock_by_jid, redis_pool, keys: [jid]) do |result|
         after_unlock(result, __method__)
       end
     end

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,3 +1,3 @@
 module SidekiqUniqueJobs
-  VERSION = '4.0.12'
+  VERSION = '4.0.13'
 end

data/redis/aquire_lock.lua

@@ -1,7 +1,6 @@
 local unique_key = KEYS[1]
 local job_id     = ARGV[1]
 local expires    = ARGV[2]
-local scheduled  = ARGV[3]
 local stored_jid = redis.pcall('get', unique_key)
 
 if stored_jid then
@@ -13,6 +12,7 @@ if stored_jid then
 end
 
 if redis.pcall('set', unique_key, job_id, 'nx', 'ex', expires) then
+  redis.pcall('hsetnx', 'uniquejobs', job_id, unique_key)
   return 1
 else
   return 0

data/redis/release_lock.lua

@@ -3,8 +3,11 @@ local job_id     = ARGV[1]
 local stored_jid = redis.pcall('get', unique_key)
 
 if stored_jid then
-  if stored_jid == job_id then
-    return redis.pcall('del', unique_key)
+  if stored_jid == job_id or stored_jid == '2' then
+    if redis.pcall('del', unique_key) then
+      redis.pcall('hdel', 'uniquejobs', job_id)
+      return 1
+    end
   else
     return 0
   end

data/spec/lib/sidekiq_unique_jobs/client/middleware_spec.rb

@@ -15,14 +15,14 @@ RSpec.describe SidekiqUniqueJobs::Client::Middleware do
     end
 
     describe 'when a job is already scheduled' do
-
       it 'processes jobs properly', sidekiq_ver: '>= 4.0.0' do
         Sidekiq::Testing.disable! do
           jid = NotifyWorker.perform_in(1, 183, 'xxxx')
           expect(jid).not_to eq(nil)
           Sidekiq.redis do |c|
             expect(c.zcard('schedule')).to eq(1)
-            expect(c.keys).to match_array(%w(schedule uniquejobs:6e47d668ad22db2a3ba0afd331514ce2))
+            expected = %w(schedule uniquejobs:6e47d668ad22db2a3ba0afd331514ce2 uniquejobs)
+            expect(c.keys).to match_array(expected)
           end
           sleep 1
           Sidekiq::Scheduled::Enq.new.enqueue_jobs

data/spec/lib/sidekiq_unique_jobs/options_with_fallback_spec.rb

@@ -39,6 +39,12 @@ RSpec.describe SidekiqUniqueJobs::OptionsWithFallback do
       let(:options) { {} }
       let(:item) { { 'unique' => 'until_executed' } }
       its(:unique_enabled?) { is_expected.to eq('until_executed') }
+
+      context 'when true' do
+        let(:options) { {} }
+        let(:item) { { 'unique' => true } }
+        its(:unique_enabled?) { is_expected.to eq(true) }
+      end
     end
   end
 
@@ -60,6 +66,32 @@ RSpec.describe SidekiqUniqueJobs::OptionsWithFallback do
     end
   end
 
+  describe '#lock_type' do
+    context 'when options["unique"] is while_executing' do
+      let(:options) { { 'unique' => 'while_executing' } }
+      let(:item) { { 'unique' => 'until_executed' } }
+      its(:lock_type) { is_expected.to eq('while_executing') }
+    end
+
+    context 'when options["unique"] is true' do
+      let(:options) { { 'unique' => true } }
+      let(:item) { { 'unique' => 'until_executed' } }
+      its(:lock_type) { is_expected.to eq('until_executed') }
+    end
+
+    context 'when item["unique"] is until_executed' do
+      let(:options) { {} }
+      let(:item) { { 'unique' => 'until_executed' } }
+      its(:lock_type) { is_expected.to eq('until_executed') }
+    end
+
+    context 'when item["unique"] is true' do
+      let(:options) { { 'unique' => true } }
+      let(:item) { { 'unique' => true } }
+      its(:lock_type) { is_expected.to eq(nil) }
+    end
+  end
+
   describe '#options' do
     context 'when worker_class respond_to get_sidekiq_options' do
       let(:worker_class) { SimpleWorker }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 4.0.12
+  version: 4.0.13
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -129,6 +129,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/bench
 - bin/jobs
 - circle.yml
 - gemfiles/sidekiq_2.15.gemfile