talentbox-delayed_job_sequel 4.0.0.beta1.1 → 4.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4f8e892e566b9bc3eb6eb7a1f2d35d94ffbde5a5
+  data.tar.gz: 2bba9ee791fa8e372ad39080a328be34655d8d69
+SHA512:
+  metadata.gz: b9f5b3c244e2f6ae39260bd9423901cc3d596bc068234cc290ab9d4881227c3721f2f18c6c9f7159ab7305cf5e213605b9a0e56db588b81858598a0be485a1bf
+  data.tar.gz: 5df02d82391bf890322db2539d9cf2091ba041543c40aa40cebdf5db540cbb3482babf0179f31c6aaae10cdd68403724ab649e1c5623d699b98307547c232de8

data/README.md

@@ -1,5 +1,8 @@
 # DelayedJob Sequel Backend
 
+[![Build Status](https://secure.travis-ci.org/TalentBox/delayed_job_sequel.png?branch=master)](http://travis-ci.org/TalentBox/delayed_job_sequel)
+[![Code Climate](https://codeclimate.com/github/TalentBox/delayed_job_sequel.png)](https://codeclimate.com/github/TalentBox/delayed_job_sequel)
+
 ## Compatibility
 
 This gem works on Ruby (MRI/CRuby) 1.8.x, 1.9.x and Rubinius (1.8 and 1.9 mode).
@@ -35,9 +38,13 @@ Create the table (using the sequel migration syntax):
       index   [:priority, :run_at]
     end
 
-## Build Status
+## Contributors
 
-[![Build Status](https://secure.travis-ci.org/TalentBox/delayed_job_sequel.png?branch=master)](http://travis-ci.org/TalentBox/delayed_job_sequel)
+Improvements has been made by those awesome contributors:
+
+* Mark Rushakoff (mark-rushakoff)
+* Phan Le
+* Tim Labeeuw
 
 ## How to contribute
 

data/lib/delayed/backend/sequel.rb

@@ -17,15 +17,17 @@ module Delayed
           db_time_now = model.db_time_now
           lock_upper_bound = db_time_now - max_run_time
           filter do
-            ( (run_at <= db_time_now) &
-              ({:locked_at => nil} | (locked_at < lock_upper_bound)) |
+            (
+              (run_at <= db_time_now) &
+              ::Sequel.expr(:locked_at => nil) |
+              (::Sequel.expr(:locked_at) < lock_upper_bound) |
               {:locked_by => worker_name}
             ) & {:failed_at => nil}
           end
         end
 
         def_dataset_method :by_priority do
-          order(:priority.asc, :run_at.asc)
+          order(::Sequel.expr(:priority).asc, ::Sequel.expr(:run_at).asc)
         end
 
         def self.before_fork
@@ -38,49 +40,20 @@ module Delayed
         end
 
         def self.reserve(worker, max_run_time = Worker.max_run_time)
-          set = ready_to_run(worker.name, max_run_time)
-          set = set.filter("priority >= ?", Worker.min_priority) if Worker.min_priority
-          set = set.filter("priority <= ?", Worker.max_priority) if Worker.max_priority
-          set = set.filter(:queue => Worker.queues) if Worker.queues.any?
-
-          job = set.by_priority.first
-
-          now = self.db_time_now
-
-          return unless job
-          model.db.transaction do
-            job.lock!
-            job.locked_at = now
-            job.locked_by = worker.name
-            job.save(:raise_on_failure => true)
-          end
-          job
-        end
-
-        # Lock this job for this worker.
-        # Returns true if we have the lock, false otherwise.
-        def lock_exclusively!(max_run_time, worker)
-          now = self.class.db_time_now
-          affected_rows = if locked_by != worker
-            # We don't own this job so we will update the locked_by name and the locked_at
-            lock_upper_bound = now - max_run_time.to_i
-            closure_pk = pk
-            self.class.filter{
-              {:id => closure_pk} &
-              ({:locked_at => nil} | (locked_at < lock_upper_bound)) &
-              (run_at <= now)
-            }.update(:locked_at => now, :locked_by => worker)
-          else
-            # We already own this job, this may happen if the job queue crashes.
-            # Simply resume and update the locked_at
-            self.class.filter(:id => id, :locked_by => worker).update(:locked_at => now)
-          end
-          if affected_rows == 1
-            self.locked_at = now
-            self.locked_by = worker
-            return true
-          else
-            return false
+          ds = ready_to_run(worker.name, max_run_time)
+          ds = ds.filter("priority >= ?", Worker.min_priority) if Worker.min_priority
+          ds = ds.filter("priority <= ?", Worker.max_priority) if Worker.max_priority
+          ds = ds.filter(:queue => Worker.queues) if Worker.queues.any?
+          ds = ds.by_priority
+          ds = ds.for_update
+
+          db.transaction do
+            if job = ds.first
+              job.locked_at = self.db_time_now
+              job.locked_by = worker.name
+              job.save(:raise_on_failure => true)
+              job
+            end
           end
         end
 
@@ -98,7 +71,7 @@ module Delayed
         end
 
         def self.delete_all
-          delete
+          dataset.delete
         end
 
         def reload(*args)
@@ -147,7 +120,7 @@ module Delayed
         # This differs from ActiveRecord which checks class and id only.
         # To pass the specs we're reverting to what AR does here.
         def eql?(obj)
-          (obj.class == model) && (obj.pk == pk)
+          (obj.class == self.class) && (obj.pk == pk)
         end
 
       end

data/spec/delayed/backend/sequel_spec.rb

@@ -8,6 +8,24 @@ describe Delayed::Backend::Sequel::Job do
 
   it_should_behave_like "a delayed_job backend"
 
+  it "does not allow more than 1 worker to grab the same job" do
+    expect {
+      10.times do
+        described_class.create(payload_object: SimpleJob.new)
+      end
+
+      20.times.map do |i|
+        Thread.new do
+          worker = Delayed::Worker.new
+          worker.name = "worker_#{i}"
+          worker.work_off(4)
+        end
+      end.map(&:join)
+    }.not_to raise_error
+
+    expect(Delayed::Job.count).to be < 10
+  end
+
   context ".count" do
     context "NewRelic sampler compat" do
       it "allow count with conditions" do

metadata

@@ -1,64 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: talentbox-delayed_job_sequel
 version: !ruby/object:Gem::Version
-  prerelease: 6
-  version: 4.0.0.beta1.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Jonathan Tron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.38'
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.28'
-    none: false
+        version: '5.0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.28'
-    none: false
-  prerelease: false
+        version: '3.38'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: delayed_job
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
-    none: false
+        version: 4.0.0
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
-    none: false
-  prerelease: false
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,31 +65,27 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.13'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.13'
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.8'
-    none: false
+        version: '0'
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.8'
-    none: false
-  prerelease: false
+        version: '0'
 description: Sequel backend for DelayedJob, originally authored by Tobias Luetke
 email:
 - jonathan@tron.name
@@ -111,6 +106,7 @@ files:
 - README.md
 homepage: http://github.com/TalentBox/delayed_job_sequel
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -121,24 +117,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 3436972036027455601
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
-  none: false
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Sequel backend for DelayedJob
 test_files:
 - spec/delayed/backend/sequel_spec.rb