delayed_job_active_record 4.1.8 → 4.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f3787467e904817090ad112e500a855194661f9295623517cc73c0bbb930c57
-  data.tar.gz: 200346cb19ab7030a82e86c41499220a6aab7e76bec940b14a17b39a96f13490
+  metadata.gz: f6046ece47a2c4aa29a266779efaedac997992b9172730d773170adc6db546aa
+  data.tar.gz: 4be7b12bce35574cf048a5fd68cfc7b4ba18d4a2c4d15985b4f6f3c91d080bd9
 SHA512:
-  metadata.gz: 96b163e6ddbd7dd28c1b8bfd33fcbc7c39ee3b7c66af76774e45f7cf60f88946b26c8afa994af786ce7b4960f33c41209bcc75a99c4c0fd8b023ad83bd737c52
-  data.tar.gz: f149d6efdc7b06935639ea8f57d39f32710f1961f285b9a1baf0afd95c8bd30553d2a2c7e59e9ced337d323008a173832c6724af12d4788976808bb9bfae6f60
+  metadata.gz: f0c5be68c20be69bcfcf118ca1ceec6a1b19b31de210b34c6323b5829f991e81fce06de3da6d366f94c3de904a4e984c1b19ad04d4d899eb7372dd091c4fc3f3
+  data.tar.gz: 46dc494917d07108c594dd6fc339d416ffeae82daa75d1298df3b79859e6a03874d56b215afec7e6e11ffd0f371cbef26f85265c28bfe38e2fb9545151e01b75

data/README.md

@@ -1,7 +1,7 @@
 **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.7).](https://github.com/collectiveidea/delayed_job_active_record/tree/v4.1.8)**
+(4.1.9).](https://github.com/collectiveidea/delayed_job_active_record/tree/v4.1.9)**
 
 # DelayedJob ActiveRecord Backend
 

data/delayed_job_active_record.gemspec

@@ -1,17 +1,22 @@
 # frozen_string_literal: true
 
 Gem::Specification.new do |spec|
+  spec.name        = "delayed_job_active_record"
+  spec.version     = "4.1.9"
+  spec.summary     = "ActiveRecord backend for DelayedJob"
+  spec.description = "ActiveRecord backend for Delayed::Job, originally authored by Tobias Lütke"
+
+  spec.licenses = "MIT"
+
+  spec.authors  = ["David Genord II", "Brian Ryckbost", "Matt Griffin", "Erik Michaels-Ober"]
+  spec.email    = ["david@collectiveidea.com", "bryckbost@gmail.com", "matt@griffinonline.org", "sferik@gmail.com"]
+  spec.homepage = "http://github.com/collectiveidea/delayed_job_active_record"
+
+  spec.files         = %w[CONTRIBUTING.md LICENSE.md README.md delayed_job_active_record.gemspec] + Dir["lib/**/*.rb"]
+  spec.require_paths = ["lib"]
+
+  spec.metadata = { "rubygems_mfa_required" => "true" }
+
   spec.add_dependency "activerecord", [">= 3.0", "< 8.0"]
   spec.add_dependency "delayed_job",  [">= 3.0", "< 5"]
-  spec.authors        = ["David Genord II", "Brian Ryckbost", "Matt Griffin", "Erik Michaels-Ober"]
-  spec.description    = "ActiveRecord backend for Delayed::Job, originally authored by Tobias Lütke"
-  spec.email          = ["david@collectiveidea.com", "bryckbost@gmail.com", "matt@griffinonline.org", "sferik@gmail.com"]
-  spec.files          = %w[CONTRIBUTING.md LICENSE.md README.md delayed_job_active_record.gemspec] + Dir["lib/**/*.rb"]
-  spec.homepage       = "http://github.com/collectiveidea/delayed_job_active_record"
-  spec.licenses       = ["MIT"]
-  spec.metadata       = { "rubygems_mfa_required" => "true" }
-  spec.name           = "delayed_job_active_record"
-  spec.require_paths  = ["lib"]
-  spec.summary        = "ActiveRecord backend for DelayedJob"
-  spec.version        = "4.1.8"
 end

data/lib/delayed/backend/active_record.rb

@@ -62,7 +62,11 @@ module Delayed
         end
 
         def self.before_fork
-          ::ActiveRecord::Base.connection_handler.clear_all_connections!
+          if Gem::Version.new("7.1.0") <= Gem::Version.new(::ActiveRecord::VERSION::STRING)
+            ::ActiveRecord::Base.clear_all_connections!(:all)
+          else
+            ::ActiveRecord::Base.clear_all_connections!
+          end
         end
 
         def self.after_fork
@@ -101,7 +105,7 @@ module Delayed
           case connection.adapter_name
           when "PostgreSQL", "PostGIS"
             reserve_with_scope_using_optimized_postgres(ready_scope, worker, now)
-          when "MySQL", "Mysql2"
+          when "MySQL", "Mysql2", "Trilogy"
             reserve_with_scope_using_optimized_mysql(ready_scope, worker, now)
           when "MSSQL", "Teradata"
             reserve_with_scope_using_optimized_mssql(ready_scope, worker, now)
@@ -129,11 +133,23 @@ module Delayed
           # 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
+          subquery = ready_scope.limit(1).lock(true).select("id").to_sql
+
+          # On PostgreSQL >= 9.5 we leverage SKIP LOCK to avoid multiple workers blocking each other
+          # when attempting to get the next available job
+          # https://www.postgresql.org/docs/9.5/sql-select.html#SQL-FOR-UPDATE-SHARE
+          if connection.send(:postgresql_version) >= 9_05_00 # rubocop:disable Style/NumericLiterals
+            subquery += " SKIP LOCKED"
+          end
+
           quoted_name = connection.quote_table_name(table_name)
-          subquery    = ready_scope.limit(1).lock(true).select("id").to_sql
-          sql         = "UPDATE #{quoted_name} SET locked_at = ?, locked_by = ? WHERE id IN (#{subquery}) RETURNING *"
-          reserved    = find_by_sql([sql, now, worker.name])
-          reserved[0]
+          find_by_sql(
+            [
+              "UPDATE #{quoted_name} SET locked_at = ?, locked_by = ? WHERE id IN (#{subquery}) RETURNING *",
+              now,
+              worker.name
+            ]
+          ).first
         end
 
         def self.reserve_with_scope_using_optimized_mysql(ready_scope, worker, now)

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_active_record
 version: !ruby/object:Gem::Version
-  version: 4.1.8
+  version: 4.1.9
 platform: ruby
 authors:
 - David Genord II
 - Brian Ryckbost
 - Matt Griffin
 - Erik Michaels-Ober
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2024-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -80,7 +80,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -95,8 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 3.5.11
+signing_key: 
 specification_version: 4
 summary: ActiveRecord backend for DelayedJob
 test_files: []