delayed_job_active_record 0.4.0 → 0.4.1

data/README.md

@@ -1,4 +1,9 @@
-# DelayedJob ActiveRecord Backend [![Build Status](https://travis-ci.org/collectiveidea/delayed_job_active_record.png)](https://travis-ci.org/collectiveidea/delayed_job_active_record) [![Dependency Status](https://gemnasium.com/collectiveidea/delayed_job_active_record.png)](https://gemnasium.com/collectiveidea/delayed_job_active_record)
+# DelayedJob ActiveRecord Backend
+
+[![Gem Version](https://badge.fury.io/rb/delayed_job_active_record.png)](https://rubygems.org/gems/delayed_job_active_record)
+[![Build Status](https://travis-ci.org/collectiveidea/delayed_job_active_record.png)](https://travis-ci.org/collectiveidea/delayed_job_active_record)
+[![Dependency Status](https://gemnasium.com/collectiveidea/delayed_job_active_record.png)](https://gemnasium.com/collectiveidea/delayed_job_active_record)
+[![Code Climate](https://codeclimate.com/github/collectiveidea/delayed_job_active_record.png)](https://codeclimate.com/github/collectiveidea/delayed_job_active_record)
 
 ## Installation
 
@@ -8,14 +13,16 @@ Add the gem to your Gemfile:
 
 Run `bundle install`.
 
-If you're using Rails, run the generator to create the migration for the delayed_job table.
+If you're using Rails, run the generator to create the migration for the
+delayed_job table.
 
     rails g delayed_job:active_record
     rake db:migrate
 
 ## Upgrading from 2.x to 3.0.0
 
-If you're upgrading from Delayed Job 2.x, run the upgrade generator to create a migration to add a column to your delayed_jobs table.
+If you're upgrading from Delayed Job 2.x, run the upgrade generator to create a
+migration to add a column to your delayed_jobs table.
 
     rails g delayed_job:upgrade
     rake db:migrate

data/delayed_job_active_record.gemspec

@@ -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.0'
+  spec.version        = '0.4.1'
 end

data/lib/delayed/backend/active_record.rb

@@ -44,26 +44,27 @@ module Delayed
           # scope to filter to records that are "ready to run"
           readyScope = self.ready_to_run(worker.name, max_run_time)
 
-          # scope to filter to the single next eligible job (locking it for update http://www.postgresql.org/docs/9.0/static/sql-select.html#SQL-FOR-UPDATE-SHARE)
+          # scope to filter to the single next eligible job
           nextScope = readyScope.scoped
           nextScope = nextScope.scoped(:conditions => ['priority >= ?', Worker.min_priority]) if Worker.min_priority
           nextScope = nextScope.scoped(:conditions => ['priority <= ?', Worker.max_priority]) if Worker.max_priority
           nextScope = nextScope.scoped(:conditions => ["queue IN (?)", Worker.queues]) if Worker.queues.any?
-          nextScope = nextScope.scoped.by_priority.limit(1).lock(true)
-          nextScope = nextScope.scoped.select('id')
+          nextScope = nextScope.scoped.by_priority.limit(1)
 
           now = self.db_time_now
 
           if ::ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
-            # This works on PostgreSQL and uses 1 less query, but uses SQL not supported nativly through ActiveRecord
+            # 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
             quotedTableName = ::ActiveRecord::Base.connection.quote_column_name(self.table_name)
-            reserved = self.find_by_sql(["UPDATE #{quotedTableName} SET locked_at = ?, locked_by = ? WHERE id IN (#{nextScope.to_sql}) RETURNING *",now,worker.name])
+            subquerySql = nextScope.lock(true).select('id').to_sql
+            reserved = self.find_by_sql(["UPDATE #{quotedTableName} SET locked_at = ?, locked_by = ? WHERE id IN (#{subquerySql}) RETURNING *",now,worker.name])
             return reserved[0]
           else
-            # This works on any database and uses seperate queries to lock and return the job
-            # Databases like PostgreSQL and MySQL that support "SELECT .. FOR UPDATE" (ActiveRecord Pessimistic locking) don't need the second application
-            # of 'readyScope' but it doesn't hurt and it ensures that the job being locked still meets ready_to_run criteria.
-            count = readyScope.where(:id => nextScope).update_all(:locked_at => now, :locked_by => worker.name)
+            # This works on MySQL and other DBs that support UPDATE...LIMIT. It uses separate queries to lock and return the job
+            count = nextScope.update_all(:locked_at => now, :locked_by => worker.name)
             return nil if count == 0
             return self.where(:locked_at => now, :locked_by => worker.name).first
           end

data/spec/database.yml

@@ -1,8 +1,14 @@
-sqlite:
-  adapter: sqlite3
-  database: ":memory:"
-
 mysql:
   adapter: mysql
-  database: delayed_job
-  uesrname: root
+  database: delayed_job_test
+  username: root
+  encoding: utf8
+
+postgresql:
+  adapter: postgresql
+  database: delayed_job_test
+  username: postgres
+
+sqlite3:
+  adapter: sqlite3
+  database: ":memory:"

data/spec/spec_helper.rb

@@ -12,7 +12,8 @@ Delayed::Worker.logger = Logger.new('/tmp/dj.log')
 ENV['RAILS_ENV'] = 'test'
 
 config = YAML.load(File.read('spec/database.yml'))
-ActiveRecord::Base.establish_connection config['sqlite']
+db_adapter = ENV['CI_DB_ADAPTER'] || 'sqlite3'
+ActiveRecord::Base.establish_connection config[db_adapter]
 ActiveRecord::Base.logger = Delayed::Worker.logger
 ActiveRecord::Migration.verbose = false
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_active_record
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-10 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -91,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1678145937006917333
+      hash: -3937611050196962247
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1678145937006917333
+      hash: -3937611050196962247
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23