switchman-inst-jobs 4.1.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a05ca311e09076da7e5fdb4cab4dc9100f2c43f63fd4607b263f23511c694aee
-  data.tar.gz: 27808a1eb26baa6729e176ca9d0be90b885cd0f48f75c52b5148296d9b9a7583
+  metadata.gz: 469e2aadfc5975a5a52eff1f92550e0d811bd30962cc25346f287e829ec88e7c
+  data.tar.gz: 10956f8da4d2662236a7ef61a092e6cd568e46886729428025625f8a17fc2ce9
 SHA512:
-  metadata.gz: ea7694250731e90416a1b826b7728600ecd299da0f704434ec06d81b3c0ade0012f29f06a9f7e78b1cf727f39a3e5052547fbe3d5d8683ac54ae804ea37e0de1
-  data.tar.gz: 3ef9c702ae77152b6576ed21828dbd97388bd1d1f87efcc104ead778bb9503f129ad5515cab5fafa6371bc96026d2f18ab3c0f818fe4d92bada28b082156c02d
+  metadata.gz: aa941c70362bbe2c61b0cb155110fd6e9905af1720f8925fbe80eb990ffc242d1788873b19e273b914e0a1b56c4346984a3ae9e3486454f2304c826d13bb42b7
+  data.tar.gz: 777f46f0ed99fa7f2a298ce6c839f5be066fb5a1a553833d80527d20c1925e7a119411ecea6e6b6c0fad205920d1e9bcea9b2850f1295938cf31b02f9b74d659

data/lib/switchman_inst_jobs/jobs_migrator.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
 require "parallel"
 
 module SwitchmanInstJobs
@@ -230,14 +229,16 @@ module SwitchmanInstJobs
         blocked_shard_ids = blocked_shards.pluck(:id)
         query = lambda { |column, scope|
           ::Delayed::Job
-            .where(id: ::Delayed::Job.select("DISTINCT ON (#{column}) id")
-              .where(scope)
+            .where(id: ::Delayed::Job
+              .with(all_col: ::Delayed::Job.and(scope).distinct.select(column))
+              .with(blocked_col: ::Delayed::Job.from("all_col").select(column).where.not(
+                ::Delayed::Job.select(1)
+                  .where(next_in_strand: true).or(::Delayed::Job.where(source: "JobsMigrator::StrandBlocker"))
+                  .where("#{column} = all_col.#{column}").arel.exists
+              ))
+              .select("DISTINCT ON (#{column}) id")
               .where.not(shard_id: blocked_shard_ids)
-              .where(
-                ::Delayed::Job.select(1).from("#{::Delayed::Job.quoted_table_name} dj2")
-                .where("dj2.next_in_strand = true OR dj2.source = 'JobsMigrator::StrandBlocker'")
-                .where("dj2.#{column} = delayed_jobs.#{column}").arel.exists.not
-              )
+              .where({ column => ::Delayed::Job.from("blocked_col").select(column) })
               .order(column, :strand_order_override, :id)).limit(batch_size)
         }
 
@@ -249,12 +250,13 @@ module SwitchmanInstJobs
           # batches
 
           loop do
-            break if query.call(:strand, "strand IS NOT NULL").update_all(next_in_strand: true).zero?
+            break if query.call(:strand, ::Delayed::Job.where.not(strand: nil)).update_all(next_in_strand: true).zero?
           end
 
           loop do
             break if query.call(:singleton,
-                                "strand IS NULL AND singleton IS NOT NULL").update_all(next_in_strand: true).zero?
+                                ::Delayed::Job.where(strand: nil)
+                                .where.not(singleton: nil)).update_all(next_in_strand: true).zero?
           end
         end
       end
@@ -347,8 +349,8 @@ module SwitchmanInstJobs
 
       private
 
-      def create_blocker_job(**kwargs)
-        first_job = ::Delayed::Job.create!(**kwargs, next_in_strand: false)
+      def create_blocker_job(**)
+        first_job = ::Delayed::Job.create!(**, next_in_strand: false)
         first_job.payload_object = ::Delayed::PerformableMethod.new(Kernel, :sleep, args: [0])
         first_job.tag = "Kernel.sleep"
         first_job.source = "JobsMigrator::StrandBlocker"

data/lib/switchman_inst_jobs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SwitchmanInstJobs
-  VERSION = "4.1.0"
+  VERSION = "4.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Bryan Petty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-24 00:00:00.000000000 Z
+date: 2025-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
@@ -53,7 +53,7 @@ dependencies:
         version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: switchman
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="