delayed_job_active_record 0.4.4 → 4.0.0.beta1

data/delayed_job_active_record.gemspec

@@ -1,8 +1,8 @@
 # coding: utf-8
 
 Gem::Specification.new do |spec|
-  spec.add_dependency   'activerecord', ['>= 2.1.0', '< 4']
-  spec.add_dependency   'delayed_job', '~> 3.0'
+  spec.add_dependency   'activerecord', ['>= 3.0', '< 4.1']
+  spec.add_dependency   'delayed_job', '~> 4.0.0.beta1'
   spec.authors        = ["Brian Ryckbost", "Matt Griffin", "Erik Michaels-Ober"]
   spec.description    = 'ActiveRecord backend for Delayed::Job, originally authored by Tobias Lütke'
   spec.email          = ['bryckbost@gmail.com', 'matt@griffinonline.org', 'sferik@gmail.com']
@@ -15,5 +15,5 @@ Gem::Specification.new do |spec|
   spec.require_paths  = ['lib']
   spec.summary        = 'ActiveRecord backend for DelayedJob'
   spec.test_files     = Dir.glob("spec/**/*")
-  spec.version        = '0.4.4'
+  spec.version        = '4.0.0.beta1'
 end

data/lib/delayed/backend/active_record.rb

@@ -7,8 +7,7 @@ module Delayed
       class Job < ::ActiveRecord::Base
         include Delayed::Backend::Base
 
-        attr_accessible :priority, :run_at, :queue, :payload_object,
-          :failed_at, :locked_at, :locked_by
+        scope :by_priority, lambda { order('priority ASC, run_at ASC') }
 
         before_save :set_default_run_at
 
@@ -23,10 +22,6 @@ module Delayed
           where('(run_at <= ? AND (locked_at IS NULL OR locked_at < ?) OR locked_by = ?) AND failed_at IS NULL', db_time_now, db_time_now - max_run_time, worker_name)
         end
 
-        def self.by_priority
-          order('priority ASC, run_at ASC')
-        end
-
         def self.before_fork
           ::ActiveRecord::Base.clear_all_connections!
         end
@@ -42,38 +37,44 @@ module Delayed
 
         def self.reserve(worker, max_run_time = Worker.max_run_time)
           # scope to filter to records that are "ready to run"
-          ready_scope = self.ready_to_run(worker.name, max_run_time)
+          readyScope = self.ready_to_run(worker.name, max_run_time)
 
           # scope to filter to the single next eligible job
-          ready_scope = ready_scope.where('priority >= ?', Worker.min_priority) if Worker.min_priority
-          ready_scope = ready_scope.where('priority <= ?', Worker.max_priority) if Worker.max_priority
-          ready_scope = ready_scope.where(:queue => Worker.queues) if Worker.queues.any?
-          ready_scope = ready_scope.by_priority
+          readyScope = readyScope.where('priority >= ?', Worker.min_priority) if Worker.min_priority
+          readyScope = readyScope.where('priority <= ?', Worker.max_priority) if Worker.max_priority
+          readyScope = readyScope.where(:queue => Worker.queues) if Worker.queues.any?
+          job = readyScope.by_priority.first
 
           now = self.db_time_now
 
-          # Optimizations for faster lookups on some common databases
-          case self.connection.adapter_name
-          when "PostgreSQL"
-            # Custom SQL required for PostgreSQL because postgres does not support UPDATE...LIMIT
-            # This locks the single record 'FOR UPDATE' in the subquery (http://www.postgresql.org/docs/9.0/static/sql-select.html#SQL-FOR-UPDATE-SHARE)
-            # Note: active_record would attempt to generate UPDATE...LIMIT like sql for postgres if we use a .limit() filter, but it would not use
-            # 'FOR UPDATE' and we would have many locking conflicts
-            quoted_table_name = self.connection.quote_table_name(self.table_name)
-            subquery_sql      = ready_scope.limit(1).lock(true).select('id').to_sql
-            reserved          = self.find_by_sql(["UPDATE #{quoted_table_name} SET locked_at = ?, locked_by = ? WHERE id IN (#{subquery_sql}) RETURNING *", now, worker.name])
-            reserved[0]
-          when "MySQL", "Mysql2"
-            # This works on MySQL and possibly some other DBs that support UPDATE...LIMIT. It uses separate queries to lock and return the job
-            count = ready_scope.limit(1).update_all(:locked_at => now, :locked_by => worker.name)
-            return nil if count == 0
-            self.where(:locked_at => now, :locked_by => worker.name).first
+          return unless job
+          job.with_lock do
+            job.locked_at = now
+            job.locked_by = worker.name
+            job.save!
+          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
+            self.class.update_all(["locked_at = ?, locked_by = ?", now, worker], ["id = ? and (locked_at is null or locked_at < ?) and (run_at <= ?)", id, (now - max_run_time.to_i), now])
+          else
+            # We already own this job, this may happen if the job queue crashes.
+            # Simply resume and update the locked_at
+            self.class.update_all(["locked_at = ?", now], ["id = ? and locked_by = ?", id, worker])
+          end
+          if affected_rows == 1
+            self.locked_at = now
+            self.locked_by = worker
+            self.changed_attributes.clear
+            return true
           else
-            # This is our old fashion, tried and true, but slower lookup
-            ready_scope.limit(worker.read_ahead).detect do |job|
-              count = ready_scope.where(:id => job.id).update_all(:locked_at => now, :locked_by => worker.name)
-              count == 1 && job.reload
-            end
+            return false
           end
         end
 

data/spec/delayed/backend/active_record_spec.rb

@@ -43,21 +43,6 @@ describe Delayed::Backend::ActiveRecord::Job do
     end
   end
 
-  context "ActiveRecord::Base.send(:attr_accessible, nil)" do
-    before do
-      Delayed::Backend::ActiveRecord::Job.send(:attr_accessible, nil)
-    end
-
-    after do
-      Delayed::Backend::ActiveRecord::Job.send(:attr_accessible, *Delayed::Backend::ActiveRecord::Job.new.attributes.keys)
-    end
-
-    it "is still accessible" do
-      job = Delayed::Backend::ActiveRecord::Job.enqueue :payload_object => EnqueueJobMod.new
-      expect(Delayed::Backend::ActiveRecord::Job.find(job.id).handler).to_not be_blank
-    end
-  end
-
   context "ActiveRecord::Base.table_name_prefix" do
     it "when prefix is not set, use 'delayed_jobs' as table name" do
       ::ActiveRecord::Base.table_name_prefix = nil

data/spec/helper.rb

@@ -49,7 +49,7 @@ class Story < ActiveRecord::Base
   self.primary_key = :story_id
   def tell; text; end
   def whatever(n, _); tell*n; end
-  default_scope where(:scoped => true)
+  default_scope { where(:scoped => true) }
 
   handle_asynchronously :whatever
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_active_record
 version: !ruby/object:Gem::Version
-  version: 0.4.4
-  prerelease: 
+  version: 4.0.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Brian Ryckbost
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -20,10 +20,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '3.0'
     - - <
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,10 +31,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '3.0'
     - - <
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: delayed_job
   requirement: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0.beta1
 description: ActiveRecord backend for Delayed::Job, originally authored by Tobias
   Lütke
 email:
@@ -91,16 +91,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1565525879185101901
+      hash: 3791598084815033964
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1565525879185101901
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25