switchman-inst-jobs 4.0.12 → 4.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4081fb390625cd34169a6585ffaddb12143403e3545988a1ada3ca90d34dc2d
-  data.tar.gz: 2f60cfa5de1529a206115bd2d68758f41f71763afbdaa980095de67dda1da544
+  metadata.gz: 8663d7c19e1900c68ab1595b7306cc2105233b1aa02bb687beee88cdbfa9ada5
+  data.tar.gz: 63f99e858a89ff31c8cda4a1dd35e072e58cda21ebf9d1cdb6a7434ad37f5968
 SHA512:
-  metadata.gz: 86bb9901b00dd38410092f17e15e1ff9b70b4907426ad32b7f2779a65844d7442e01e8df056d2293c90354eb814e880068854713e9169099e7d772294fc0a1d9
-  data.tar.gz: 9376187ebecfaab79e07696fd44ed762694e5ed06e9b539183f93f0f49e9706fa9eef59d6e9ef5456bccae2be780360d021da600e854eb8f2afcace71ca25bb5
+  metadata.gz: '0322296a92637bb28cc00cfe41446fc39eb189fb4c5e433fb1adf115f1ab80204d91228c96a5902d5f2ece3906805e478ecf166dee37ef9d17b7ce9d4c28c1bd'
+  data.tar.gz: 769694ebfd1343c2449b18b14b8883aaab0cf3819e01446878328461542657d31df576501db5539f572cf5bae8ca5c460354e960e4c27f3b3996a6c3439894c4

data/lib/switchman_inst_jobs/jobs_migrator.rb

@@ -285,8 +285,7 @@ module SwitchmanInstJobs
         ::Delayed::Job.
           where.not(strand: nil).
           group(:strand).
-          having('NOT BOOL_OR(next_in_strand)').
-          pluck(:strand)
+          having('NOT BOOL_OR(next_in_strand)')
       end
 
       def unblock_strand!(strand, new_parallelism: nil)
@@ -315,8 +314,7 @@ module SwitchmanInstJobs
           where(strand: nil).
           where.not(singleton: nil).
           group(:singleton).
-          having('NOT BOOL_OR(next_in_strand)').
-          pluck(:singleton)
+          having('NOT BOOL_OR(next_in_strand)')
       end
 
       def unblock_singleton!(singleton)
@@ -338,6 +336,12 @@ module SwitchmanInstJobs
         end
       end
 
+      def blocked_job_count
+        ::Delayed::Job.from(blocked_strands.select('count(id) AS ssize')).sum('ssize').to_i +
+          ::Delayed::Job.from(blocked_singletons.select('count(id) AS ssize')).sum('ssize').to_i +
+          ::Delayed::Job.where(strand: nil, singleton: nil, next_in_strand: false).count
+      end
+
       private
 
       def create_blocker_job(**kwargs)

data/lib/switchman_inst_jobs/version.rb

@@ -1,3 +1,3 @@
 module SwitchmanInstJobs
-  VERSION = '4.0.12'.freeze
+  VERSION = '4.0.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 4.0.12
+  version: 4.0.13
 platform: ruby
 authors:
 - Bryan Petty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs