switchman-inst-jobs 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a05ca311e09076da7e5fdb4cab4dc9100f2c43f63fd4607b263f23511c694aee
-  data.tar.gz: 27808a1eb26baa6729e176ca9d0be90b885cd0f48f75c52b5148296d9b9a7583
+  metadata.gz: e1c01e6bdfd2a5cd3ddd756936a2793526c8e8860883bcd1ea8caa9febad979d
+  data.tar.gz: 4998d1686e5dfceffb5c1a41dcf0959266c8caf73bd99aa0e50e89523e41ba51
 SHA512:
-  metadata.gz: ea7694250731e90416a1b826b7728600ecd299da0f704434ec06d81b3c0ade0012f29f06a9f7e78b1cf727f39a3e5052547fbe3d5d8683ac54ae804ea37e0de1
-  data.tar.gz: 3ef9c702ae77152b6576ed21828dbd97388bd1d1f87efcc104ead778bb9503f129ad5515cab5fafa6371bc96026d2f18ab3c0f818fe4d92bada28b082156c02d
+  metadata.gz: aae64990ef75016c24ded178bf0edcf4b4343499b6d226d6c86104d9d15d23bd7a77acf35e622aff989e3292d0abf59bd15d4dd3d20e11e4f9e66e4fe393e581
+  data.tar.gz: 854dd08052ca1b042646ce2fd08c4c0f76d2f5075f11ecebf34f04f8293c3ab2c8d9977817adf2b5e0f6e4c67a6726e49bd4dc9d491b961a391588e78c22a274

data/lib/switchman_inst_jobs/jobs_migrator.rb

@@ -230,14 +230,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 +251,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

data/lib/switchman_inst_jobs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SwitchmanInstJobs
-  VERSION = "4.1.0"
+  VERSION = "4.2.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.2.0
 platform: ruby
 authors:
 - Bryan Petty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-24 00:00:00.000000000 Z
+date: 2025-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs