switchman-inst-jobs 3.2.4 → 4.0.0

data/lib/switchman_inst_jobs/switchman/shard.rb

@@ -22,12 +22,12 @@ module SwitchmanInstJobs
       def hold_jobs!(wait: false)
         self.jobs_held = true
         save! if changed?
-        delayed_jobs_shard.activate(:delayed_jobs) do
+        delayed_jobs_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
           lock_jobs_for_hold
         end
         return unless wait
 
-        delayed_jobs_shard.activate(:delayed_jobs) do
+        delayed_jobs_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
           while ::Delayed::Job.where(shard_id: id).
               where.not(locked_at: nil).
               where.not(locked_by: ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY).exists?
@@ -47,7 +47,7 @@ module SwitchmanInstJobs
           Rails.logger.debug('Waiting for caches to clear')
           sleep(65)
         end
-        delayed_jobs_shard.activate(:delayed_jobs) do
+        delayed_jobs_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
           ::Delayed::Job.where(locked_by: ::Delayed::Backend::Base::ON_HOLD_LOCKED_BY, shard_id: id).
             in_batches(of: 10_000).
             update_all(
@@ -75,22 +75,14 @@ module SwitchmanInstJobs
           remove_instance_variable(:@delayed_jobs_shards) if instance_variable_defined?(:@delayed_jobs_shards)
         end
 
-        def current(category = :primary)
-          if category == :delayed_jobs
-            active_shards[category] || super(:primary).delayed_jobs_shard
-          else
-            super
-          end
-        end
-
         def activate!(categories)
           if !@skip_delayed_job_auto_activation &&
-             !categories[:delayed_jobs] &&
-             categories[:primary] &&
-             categories[:primary] != active_shards[:primary]
+             !categories[::Delayed::Backend::ActiveRecord::AbstractJob] &&
+             categories[::ActiveRecord::Base] &&
+             categories[::ActiveRecord::Base] != ::Switchman::Shard.current(::ActiveRecord::Base)
             skip_delayed_job_auto_activation do
-              categories[:delayed_jobs] =
-                categories[:primary].delayed_jobs_shard
+              categories[::Delayed::Backend::ActiveRecord::AbstractJob] =
+                categories[::ActiveRecord::Base].delayed_jobs_shard
             end
           end
           super
@@ -104,11 +96,6 @@ module SwitchmanInstJobs
           @skip_delayed_job_auto_activation = was
         end
 
-        def create
-          db = ::Switchman::DatabaseServer.server_for_new_shard
-          db.create_new_shard
-        end
-
         def periodic_clear_shard_cache
           # TODO: make this configurable
           @timed_cache ||= TimedCache.new(-> { 60.to_i.seconds.ago }) do

data/lib/switchman_inst_jobs/version.rb

@@ -1,3 +1,3 @@
 module SwitchmanInstJobs
-  VERSION = '3.2.4'.freeze
+  VERSION = '4.0.0'.freeze
 end

data/lib/switchman_inst_jobs.rb

@@ -5,6 +5,9 @@ module SwitchmanInstJobs
   cattr_accessor :delayed_jobs_shard_fallback
 
   def self.initialize_active_record
+    ::ActiveRecord::ConnectionAdapters::ConnectionPool.prepend(
+      ActiveRecord::ConnectionAdapters::ConnectionPool
+    )
     ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(
       ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
     )
@@ -14,6 +17,10 @@ module SwitchmanInstJobs
     ::Delayed::Backend::ActiveRecord::Job.prepend(
       Delayed::Backend::Base
     )
+    ::Delayed::Backend::Redis::Job.prepend(
+      Delayed::Backend::Base
+    )
+    ::Delayed::Backend::Redis::Job.column :shard_id, :integer
     ::Delayed::Pool.prepend Delayed::Pool
     ::Delayed::Worker.prepend Delayed::Worker
     ::Delayed::Worker::HealthCheck.prepend Delayed::Worker::HealthCheck
@@ -32,6 +39,7 @@ module SwitchmanInstJobs
   end
 end
 
+require 'switchman_inst_jobs/active_record/connection_adapters/connection_pool'
 require 'switchman_inst_jobs/active_record/connection_adapters/postgresql_adapter'
 require 'switchman_inst_jobs/active_record/migration'
 require 'switchman_inst_jobs/delayed/settings'

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 4.0.0
 platform: ruby
 authors:
 - Bryan Petty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.9
-    - - "<"
+        version: '2.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.9
-    - - "<"
+        version: '2.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -50,34 +50,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: switchman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -110,16 +116,16 @@ dependencies:
   name: diplomat
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
   requirement: !ruby/object:Gem::Requirement
@@ -182,70 +188,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
@@ -289,6 +295,7 @@ files:
 - db/migrate/20151210162949_improve_max_concurrent.rb
 - db/migrate/20161206323555_add_back_default_string_limits_jobs.rb
 - db/migrate/20170308045400_add_shard_id_to_delayed_jobs.rb
+- db/migrate/20170308045401_add_delayed_jobs_shard_id_to_switchman_shards.rb
 - db/migrate/20181217155351_speed_up_max_concurrent_triggers.rb
 - db/migrate/20190726154743_make_critical_columns_not_null.rb
 - db/migrate/20200330230722_add_id_to_get_delayed_jobs_index.rb
@@ -296,13 +303,9 @@ files:
 - db/migrate/20200822014259_add_block_stranded_to_switchman_shards.rb
 - db/migrate/20200824222232_speed_up_max_concurrent_delete_trigger.rb
 - db/migrate/20200825011002_add_strand_order_override.rb
-- db/migrate/20210809145804_add_n_strand_index.rb
-- db/migrate/20210812210128_add_singleton_column.rb
-- db/migrate/20210917232626_add_delete_conflicting_singletons_before_unlock_trigger.rb
-- db/migrate/20210928174754_fix_singleton_condition_in_before_insert.rb
-- db/migrate/20210929204903_update_conflicting_singleton_function_to_use_index.rb
 - lib/switchman-inst-jobs.rb
 - lib/switchman_inst_jobs.rb
+- lib/switchman_inst_jobs/active_record/connection_adapters/connection_pool.rb
 - lib/switchman_inst_jobs/active_record/connection_adapters/postgresql_adapter.rb
 - lib/switchman_inst_jobs/active_record/migration.rb
 - lib/switchman_inst_jobs/delayed/backend/base.rb
@@ -340,7 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Switchman and Instructure Jobs compatibility gem.

data/db/migrate/20210809145804_add_n_strand_index.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-class AddNStrandIndex < ActiveRecord::Migration[5.2]
-  disable_ddl_transaction!
-
-  def change
-    add_index :delayed_jobs, %i[strand next_in_strand id],
-              name: 'n_strand_index',
-              where: 'strand IS NOT NULL',
-              algorithm: :concurrently
-  end
-end

data/db/migrate/20210812210128_add_singleton_column.rb

@@ -1,200 +0,0 @@
-# frozen_string_literal: true
-
-class AddSingletonColumn < ActiveRecord::Migration[5.2]
-  disable_ddl_transaction!
-
-  def change
-    add_column :delayed_jobs, :singleton, :string, if_not_exists: true
-    add_column :failed_jobs, :singleton, :string, if_not_exists: true
-    # only one job can be queued in a singleton
-    add_index :delayed_jobs,
-              :singleton,
-              where: 'singleton IS NOT NULL AND locked_by IS NULL',
-              unique: true,
-              name: 'index_delayed_jobs_on_singleton_not_running',
-              algorithm: :concurrently
-    # only one job can be running for a singleton
-    add_index :delayed_jobs,
-              :singleton,
-              where: 'singleton IS NOT NULL AND locked_by IS NOT NULL',
-              unique: true,
-              name: 'index_delayed_jobs_on_singleton_running',
-              algorithm: :concurrently
-
-    reversible do |direction|
-      direction.up do
-        execute(<<~SQL)
-          CREATE OR REPLACE FUNCTION #{connection.quote_table_name('delayed_jobs_after_delete_row_tr_fn')} () RETURNS trigger AS $$
-          DECLARE
-            running_count integer;
-            should_lock boolean;
-            should_be_precise boolean;
-            update_query varchar;
-            skip_locked varchar;
-          BEGIN
-            IF OLD.strand IS NOT NULL THEN
-              should_lock := true;
-              should_be_precise := OLD.id % (OLD.max_concurrent * 4) = 0;
-
-              IF NOT should_be_precise AND OLD.max_concurrent > 16 THEN
-                running_count := (SELECT COUNT(*) FROM (
-                  SELECT 1 as one FROM delayed_jobs WHERE strand = OLD.strand AND next_in_strand = 't' LIMIT OLD.max_concurrent
-                ) subquery_for_count);
-                should_lock := running_count < OLD.max_concurrent;
-              END IF;
-
-              IF should_lock THEN
-                PERFORM pg_advisory_xact_lock(half_md5_as_bigint(OLD.strand));
-              END IF;
-
-              -- note that we don't really care if the row we're deleting has a singleton, or if it even
-              -- matches the row(s) we're going to update. we just need to make sure that whatever
-              -- singleton we grab isn't already running (which is a simple existence check, since
-              -- the unique indexes ensure there is at most one singleton running, and one queued)
-              update_query := 'UPDATE delayed_jobs SET next_in_strand=true WHERE id IN (
-                SELECT id FROM delayed_jobs j2
-                  WHERE next_in_strand=false AND
-                    j2.strand=$1.strand AND
-                    (j2.singleton IS NULL OR NOT EXISTS (SELECT 1 FROM delayed_jobs j3 WHERE j3.singleton=j2.singleton AND j3.id<>j2.id))
-                  ORDER BY j2.strand_order_override ASC, j2.id ASC
-                  LIMIT ';
-
-              IF should_be_precise THEN
-                running_count := (SELECT COUNT(*) FROM (
-                  SELECT 1 FROM delayed_jobs WHERE strand = OLD.strand AND next_in_strand = 't' LIMIT OLD.max_concurrent
-                ) s);
-                IF running_count < OLD.max_concurrent THEN
-                  update_query := update_query || '($1.max_concurrent - $2)';
-                ELSE
-                  -- we have too many running already; just bail
-                  RETURN OLD;
-                END IF;
-              ELSE
-                update_query := update_query || '1';
-
-                -- n-strands don't require precise ordering; we can make this query more performant
-                IF OLD.max_concurrent > 1 THEN
-                  skip_locked := ' SKIP LOCKED';
-                END IF;
-              END IF;
-
-              update_query := update_query || ' FOR UPDATE' || COALESCE(skip_locked, '') || ')';
-              EXECUTE update_query USING OLD, running_count;
-            ELSIF OLD.singleton IS NOT NULL THEN
-              UPDATE delayed_jobs SET next_in_strand = 't' WHERE singleton=OLD.singleton AND next_in_strand=false;
-            END IF;
-            RETURN OLD;
-          END;
-          $$ LANGUAGE plpgsql SET search_path TO #{::Switchman::Shard.current.name};
-        SQL
-        execute(<<~SQL)
-          CREATE OR REPLACE FUNCTION #{connection.quote_table_name('delayed_jobs_before_insert_row_tr_fn')} () RETURNS trigger AS $$
-          BEGIN
-            IF NEW.strand IS NOT NULL THEN
-              PERFORM pg_advisory_xact_lock(half_md5_as_bigint(NEW.strand));
-              IF (SELECT COUNT(*) FROM (
-                  SELECT 1 FROM delayed_jobs WHERE strand = NEW.strand AND next_in_strand=true LIMIT NEW.max_concurrent
-                ) s) = NEW.max_concurrent THEN
-                NEW.next_in_strand := false;
-              END IF;
-            END IF;
-            IF NEW.singleton IS NOT NULL THEN
-              PERFORM 1 FROM delayed_jobs WHERE singleton = NEW.singleton;
-              IF FOUND THEN
-                NEW.next_in_strand := false;
-              END IF;
-            END IF;
-            RETURN NEW;
-          END;
-          $$ LANGUAGE plpgsql SET search_path TO #{::Switchman::Shard.current.name};
-        SQL
-      end
-      direction.down do
-        execute(<<~SQL)
-          CREATE OR REPLACE FUNCTION #{connection.quote_table_name('delayed_jobs_after_delete_row_tr_fn')} () RETURNS trigger AS $$
-          DECLARE
-            running_count integer;
-            should_lock boolean;
-            should_be_precise boolean;
-          BEGIN
-            IF OLD.strand IS NOT NULL THEN
-              should_lock := true;
-              should_be_precise := OLD.id % (OLD.max_concurrent * 4) = 0;
-
-              IF NOT should_be_precise AND OLD.max_concurrent > 16 THEN
-                running_count := (SELECT COUNT(*) FROM (
-                  SELECT 1 as one FROM delayed_jobs WHERE strand = OLD.strand AND next_in_strand = 't' LIMIT OLD.max_concurrent
-                ) subquery_for_count);
-                should_lock := running_count < OLD.max_concurrent;
-              END IF;
-
-              IF should_lock THEN
-                PERFORM pg_advisory_xact_lock(half_md5_as_bigint(OLD.strand));
-              END IF;
-
-              IF should_be_precise THEN
-                running_count := (SELECT COUNT(*) FROM (
-                  SELECT 1 as one FROM delayed_jobs WHERE strand = OLD.strand AND next_in_strand = 't' LIMIT OLD.max_concurrent
-                ) subquery_for_count);
-                IF running_count < OLD.max_concurrent THEN
-                  UPDATE delayed_jobs SET next_in_strand = 't' WHERE id IN (
-                    SELECT id FROM delayed_jobs j2 WHERE next_in_strand = 'f' AND
-                    j2.strand = OLD.strand ORDER BY j2.strand_order_override ASC, j2.id ASC LIMIT (OLD.max_concurrent - running_count) FOR UPDATE
-                  );
-                END IF;
-              ELSE
-                -- n-strands don't require precise ordering; we can make this query more performant
-                IF OLD.max_concurrent > 1 THEN
-                  UPDATE delayed_jobs SET next_in_strand = 't' WHERE id =
-                  (SELECT id FROM delayed_jobs j2 WHERE next_in_strand = 'f' AND
-                    j2.strand = OLD.strand ORDER BY j2.strand_order_override ASC, j2.id ASC LIMIT 1 FOR UPDATE SKIP LOCKED);
-                ELSE
-                  UPDATE delayed_jobs SET next_in_strand = 't' WHERE id =
-                    (SELECT id FROM delayed_jobs j2 WHERE next_in_strand = 'f' AND
-                      j2.strand = OLD.strand ORDER BY j2.strand_order_override ASC, j2.id ASC LIMIT 1 FOR UPDATE);
-                END IF;
-              END IF;
-            END IF;
-            RETURN OLD;
-          END;
-          $$ LANGUAGE plpgsql SET search_path TO #{::Switchman::Shard.current.name};
-        SQL
-        execute(<<~SQL)
-          CREATE OR REPLACE FUNCTION #{connection.quote_table_name('delayed_jobs_before_insert_row_tr_fn')} () RETURNS trigger AS $$
-          BEGIN
-            IF NEW.strand IS NOT NULL THEN
-              PERFORM pg_advisory_xact_lock(half_md5_as_bigint(NEW.strand));
-              IF (SELECT COUNT(*) FROM (
-                  SELECT 1 AS one FROM delayed_jobs WHERE strand = NEW.strand LIMIT NEW.max_concurrent
-                ) subquery_for_count) = NEW.max_concurrent THEN
-                NEW.next_in_strand := 'f';
-              END IF;
-            END IF;
-            RETURN NEW;
-          END;
-          $$ LANGUAGE plpgsql SET search_path TO #{::Switchman::Shard.current.name};
-        SQL
-      end
-    end
-
-    connection.transaction do
-      reversible do |direction|
-        direction.up do
-          drop_triggers
-          execute("CREATE TRIGGER delayed_jobs_before_insert_row_tr BEFORE INSERT ON #{::Delayed::Job.quoted_table_name} FOR EACH ROW WHEN (NEW.strand IS NOT NULL OR NEW.singleton IS NOT NULL) EXECUTE PROCEDURE #{connection.quote_table_name('delayed_jobs_before_insert_row_tr_fn')}()")
-          execute("CREATE TRIGGER delayed_jobs_after_delete_row_tr AFTER DELETE ON #{::Delayed::Job.quoted_table_name} FOR EACH ROW WHEN ((OLD.strand IS NOT NULL OR OLD.singleton IS NOT NULL) AND OLD.next_in_strand=true) EXECUTE PROCEDURE #{connection.quote_table_name('delayed_jobs_after_delete_row_tr_fn')}()")
-        end
-        direction.down do
-          drop_triggers
-          execute("CREATE TRIGGER delayed_jobs_before_insert_row_tr BEFORE INSERT ON #{::Delayed::Job.quoted_table_name} FOR EACH ROW WHEN (NEW.strand IS NOT NULL) EXECUTE PROCEDURE #{connection.quote_table_name('delayed_jobs_before_insert_row_tr_fn')}()")
-          execute("CREATE TRIGGER delayed_jobs_after_delete_row_tr AFTER DELETE ON #{::Delayed::Job.quoted_table_name} FOR EACH ROW WHEN (OLD.strand IS NOT NULL AND OLD.next_in_strand = 't') EXECUTE PROCEDURE #{connection.quote_table_name('delayed_jobs_after_delete_row_tr_fn()')}")
-        end
-      end
-    end
-  end
-
-  def drop_triggers
-    execute("DROP TRIGGER delayed_jobs_before_insert_row_tr ON #{::Delayed::Job.quoted_table_name}")
-    execute("DROP TRIGGER delayed_jobs_after_delete_row_tr ON #{::Delayed::Job.quoted_table_name}")
-  end
-end

data/db/migrate/20210917232626_add_delete_conflicting_singletons_before_unlock_trigger.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-class AddDeleteConflictingSingletonsBeforeUnlockTrigger < ActiveRecord::Migration[5.2]
-  def up
-    execute(<<~SQL)
-      CREATE FUNCTION #{connection.quote_table_name('delayed_jobs_before_unlock_delete_conflicting_singletons_row_fn')} () RETURNS trigger AS $$
-      BEGIN
-        IF EXISTS (SELECT 1 FROM delayed_jobs j2 WHERE j2.singleton=OLD.singleton) THEN
-          DELETE FROM delayed_jobs WHERE id<>OLD.id AND singleton=OLD.singleton;
-        END IF;
-        RETURN NEW;
-      END;
-      $$ LANGUAGE plpgsql SET search_path TO #{::Switchman::Shard.current.name};
-    SQL
-    execute(<<~SQL)
-      CREATE TRIGGER delayed_jobs_before_unlock_delete_conflicting_singletons_row_tr BEFORE UPDATE ON #{::Delayed::Job.quoted_table_name} FOR EACH ROW WHEN (
-        OLD.singleton IS NOT NULL AND
-        OLD.singleton=NEW.singleton AND
-        OLD.locked_by IS NOT NULL AND
-        NEW.locked_by IS NULL) EXECUTE PROCEDURE #{connection.quote_table_name('delayed_jobs_before_unlock_delete_conflicting_singletons_row_fn')}();
-    SQL
-  end
-
-  def down
-    execute("DROP FUNCTION #{connection.quote_table_name('delayed_jobs_before_unlock_delete_conflicting_singletons_row_tr_fn')}() CASCADE")
-  end
-end

data/db/migrate/20210928174754_fix_singleton_condition_in_before_insert.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-class FixSingletonConditionInBeforeInsert < ActiveRecord::Migration[5.2]
-  def change
-    reversible do |direction|
-      direction.up do
-        execute(<<~SQL)
-          CREATE OR REPLACE FUNCTION #{connection.quote_table_name('delayed_jobs_before_insert_row_tr_fn')} () RETURNS trigger AS $$
-          BEGIN
-            IF NEW.strand IS NOT NULL THEN
-              PERFORM pg_advisory_xact_lock(half_md5_as_bigint(NEW.strand));
-              IF (SELECT COUNT(*) FROM (
-                  SELECT 1 FROM delayed_jobs WHERE strand = NEW.strand AND next_in_strand=true LIMIT NEW.max_concurrent
-                ) s) = NEW.max_concurrent THEN
-                NEW.next_in_strand := false;
-              END IF;
-            END IF;
-            IF NEW.singleton IS NOT NULL THEN
-              -- this condition seems silly, but it forces postgres to use the two partial indexes on singleton,
-              -- rather than doing a seq scan
-              PERFORM 1 FROM delayed_jobs WHERE singleton = NEW.singleton AND (locked_by IS NULL OR locked_by IS NOT NULL);
-              IF FOUND THEN
-                NEW.next_in_strand := false;
-              END IF;
-            END IF;
-            RETURN NEW;
-          END;
-          $$ LANGUAGE plpgsql SET search_path TO #{::Switchman::Shard.current.name};
-        SQL
-      end
-      direction.down do
-        execute(<<~SQL)
-          CREATE OR REPLACE FUNCTION #{connection.quote_table_name('delayed_jobs_before_insert_row_tr_fn')} () RETURNS trigger AS $$
-          BEGIN
-            IF NEW.strand IS NOT NULL THEN
-              PERFORM pg_advisory_xact_lock(half_md5_as_bigint(NEW.strand));
-              IF (SELECT COUNT(*) FROM (
-                  SELECT 1 FROM delayed_jobs WHERE strand = NEW.strand AND next_in_strand=true LIMIT NEW.max_concurrent
-                ) s) = NEW.max_concurrent THEN
-                NEW.next_in_strand := false;
-              END IF;
-            END IF;
-            IF NEW.singleton IS NOT NULL THEN
-              PERFORM 1 FROM delayed_jobs WHERE singleton = NEW.singleton;
-              IF FOUND THEN
-                NEW.next_in_strand := false;
-              END IF;
-            END IF;
-            RETURN NEW;
-          END;
-          $$ LANGUAGE plpgsql SET search_path TO #{::Switchman::Shard.current.name};
-        SQL
-      end
-    end
-  end
-end

data/db/migrate/20210929204903_update_conflicting_singleton_function_to_use_index.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-class UpdateConflictingSingletonFunctionToUseIndex < ActiveRecord::Migration[5.2]
-  def up
-    execute(<<~SQL)
-      CREATE OR REPLACE FUNCTION #{connection.quote_table_name('delayed_jobs_before_unlock_delete_conflicting_singletons_row_fn')} () RETURNS trigger AS $$
-      BEGIN
-        DELETE FROM delayed_jobs WHERE id<>OLD.id AND singleton=OLD.singleton AND locked_by IS NULL;
-        RETURN NEW;
-      END;
-      $$ LANGUAGE plpgsql SET search_path TO #{::Switchman::Shard.current.name};
-    SQL
-  end
-
-  def down
-    execute(<<~SQL)
-      CREATE OR REPLACE FUNCTION #{connection.quote_table_name('delayed_jobs_before_unlock_delete_conflicting_singletons_row_fn')} () RETURNS trigger AS $$
-      BEGIN
-        IF EXISTS (SELECT 1 FROM delayed_jobs j2 WHERE j2.singleton=OLD.singleton) THEN
-          DELETE FROM delayed_jobs WHERE id<>OLD.id AND singleton=OLD.singleton;
-        END IF;
-        RETURN NEW;
-      END;
-      $$ LANGUAGE plpgsql SET search_path TO #{::Switchman::Shard.current.name};
-    SQL
-  end
-end