delayed_job_active_record 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef929cbdb8454d37f3c65c7c1ef5c35af9c58bda
-  data.tar.gz: 3e07fc038e9b3f5070f82db76567998b6a78dbc9
+  metadata.gz: 3fd97d1444b2e5cbf2bfa22b304cde221619558d
+  data.tar.gz: 000b0e8eedbd1c0d2f470288d03f3349bf72f2d8
 SHA512:
-  metadata.gz: 02ba4660e00fb9fd21fc324c7796c545a894954dd2d08f6fb733f508187afbee91768c86d1cb0f8792bcac61345041c30dcd741c94b9f140621cb96a83db375e
-  data.tar.gz: e94cc064175c69d4b09751c0fcb4d05390ec5e3a6fbaae090c4afc7641a8a76cbc52ab2434dbac24eff55216adb9728d2b3d1d96f1b68d2d41e9c36c3a66cac9
+  metadata.gz: 689515b8aa68f2395b5f5d3ab31f0b2fb8098bb8cdc8f3f93eb1cbcd93db84d6cb78db67e43e1b6fe93f999bd3a9d61aecf3138ec17a0bac6439c9600a387ec6
+  data.tar.gz: 2488595100525ad2b22c1112dd6a90e37507e47342e6fdb936d5ba465662dac49e0092b91d1a03bf6feb7facfaf1624161456ae682d1733943231b6c8848c14f

data/README.md

@@ -1,3 +1,8 @@
+**If you're viewing this at https://github.com/collectiveidea/delayed_job_active_record,
+you're reading the documentation for the master branch.
+[View documentation for the latest release
+(4.1.0).](https://github.com/collectiveidea/delayed_job_active_record/tree/v4.1.0)**
+
 # DelayedJob ActiveRecord Backend
 
 [![Gem Version](https://badge.fury.io/rb/delayed_job_active_record.png)](https://rubygems.org/gems/delayed_job_active_record)
@@ -20,6 +25,12 @@ delayed_job table.
     rails g delayed_job:active_record
     rake db:migrate
 
+## Problems locking jobs
+
+You can try using the legacy locking code. It is usually slower but works better for certain people.
+
+    Delayed::Backend::ActiveRecord.configuration.reserve_sql_strategy = :default_sql
+
 ## Upgrading from 2.x to 3.0.0
 
 If you're upgrading from Delayed Job 2.x, run the upgrade generator to create a

data/delayed_job_active_record.gemspec

@@ -1,5 +1,5 @@
 Gem::Specification.new do |spec|
-  spec.add_dependency "activerecord", [">= 3.0", "< 5"]
+  spec.add_dependency "activerecord", [">= 3.0", "< 5.1"]
   spec.add_dependency "delayed_job",  [">= 3.0", "< 5"]
   spec.authors        = ["Brian Ryckbost", "Matt Griffin", "Erik Michaels-Ober"]
   spec.description    = "ActiveRecord backend for Delayed::Job, originally authored by Tobias Lütke"
@@ -10,5 +10,5 @@ Gem::Specification.new do |spec|
   spec.name           = "delayed_job_active_record"
   spec.require_paths  = ["lib"]
   spec.summary        = "ActiveRecord backend for DelayedJob"
-  spec.version        = "4.1.0"
+  spec.version        = "4.1.1"
 end

data/lib/delayed/backend/active_record.rb

@@ -2,6 +2,27 @@ require "active_record/version"
 module Delayed
   module Backend
     module ActiveRecord
+      class Configuration
+        attr_reader :reserve_sql_strategy
+
+        def initialize
+          self.reserve_sql_strategy = :optimized_sql
+        end
+
+        def reserve_sql_strategy=(val)
+          raise ArgumentError, "allowed values are :optimized_sql or :default_sql" unless val == :optimized_sql || val == :default_sql
+          @reserve_sql_strategy = val
+        end
+      end
+
+      def self.configuration
+        @configuration ||= Configuration.new
+      end
+
+      def self.configure
+        yield(configuration)
+      end
+
       # A job object that is persisted to the database.
       # Contains the work object as a YAML field.
       class Job < ::ActiveRecord::Base
@@ -54,7 +75,18 @@ module Delayed
         end
 
         def self.reserve_with_scope(ready_scope, worker, now)
+          case Delayed::Backend::ActiveRecord.configuration.reserve_sql_strategy
           # Optimizations for faster lookups on some common databases
+          when :optimized_sql
+            reserve_with_scope_using_optimized_sql(ready_scope, worker, now)
+          # Slower but in some cases more unproblematic strategy to lookup records
+          # See https://github.com/collectiveidea/delayed_job_active_record/pull/89 for more details.
+          when :default_sql
+            reserve_with_scope_using_default_sql(ready_scope, worker, now)
+          end
+        end
+
+        def self.reserve_with_scope_using_optimized_sql(ready_scope, worker, now)
           case connection.adapter_name
           when "PostgreSQL"
             # Custom SQL required for PostgreSQL because postgres does not support UPDATE...LIMIT
@@ -91,6 +123,7 @@ module Delayed
             return nil if count == 0
             # MSSQL JDBC doesn't support OUTPUT INSERTED.* for returning a result set, so query locked row
             where(locked_at: now, locked_by: worker.name, failed_at: nil).first
+          # Fallback for unknown / other DBMS
           else
             reserve_with_scope_using_default_sql(ready_scope, worker, now)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_active_record
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Brian Ryckbost
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +21,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: delayed_job
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ActiveRecord backend for DelayedJob