Merge branch 'remove-redundant-modsecurity-indexes' into 'master'

Remove redundant indexes from CI variables

See merge request gitlab-org/gitlab!30021

changelogs/unreleased/remove-redundant-modsecurity-indexes.yml

+---
+title: Remove unused WAF indexes from CI variables
+merge_request: 30021
+author:
+type: other

db/migrate/20200421054930_remove_index_on_pipeline_id_from_ci_pipeline_variables.rb

+# frozen_string_literal: true
+
+class RemoveIndexOnPipelineIdFromCiPipelineVariables < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX_NAME = 'index_ci_pipeline_variables_on_pipeline_id'
+
+  disable_ddl_transaction!
+
+  def up
+    remove_concurrent_index_by_name :ci_pipeline_variables, INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index :ci_pipeline_variables, :pipeline_id, name: INDEX_NAME, where: "key = 'AUTO_DEVOPS_MODSECURITY_SEC_RULE_ENGINE'"
+  end
+end

db/migrate/20200421054948_remove_index_on_pipeline_id_from_ci_variables.rb

+# frozen_string_literal: true
+
+class RemoveIndexOnPipelineIdFromCiVariables < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX_NAME = 'index_ci_variables_on_project_id'
+
+  disable_ddl_transaction!
+
+  def up
+    remove_concurrent_index_by_name :ci_variables, INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index :ci_variables, :project_id, name: INDEX_NAME, where: "key = 'AUTO_DEVOPS_MODSECURITY_SEC_RULE_ENGINE'"
+  end
+end

db/structure.sql

@@ -9338,8 +9338,6 @@ CREATE INDEX index_ci_pipeline_schedules_on_owner_id ON public.ci_pipeline_sched
 
 CREATE INDEX index_ci_pipeline_schedules_on_project_id ON public.ci_pipeline_schedules USING btree (project_id);
 
-CREATE INDEX index_ci_pipeline_variables_on_pipeline_id ON public.ci_pipeline_variables USING btree (pipeline_id) WHERE ((key)::text = 'AUTO_DEVOPS_MODSECURITY_SEC_RULE_ENGINE'::text);
-
 CREATE UNIQUE INDEX index_ci_pipeline_variables_on_pipeline_id_and_key ON public.ci_pipeline_variables USING btree (pipeline_id, key);
 
 CREATE INDEX index_ci_pipelines_config_on_pipeline_id ON public.ci_pipelines_config USING btree (pipeline_id);
@@ -9436,8 +9434,6 @@ CREATE INDEX index_ci_triggers_on_owner_id ON public.ci_triggers USING btree (ow
 
 CREATE INDEX index_ci_triggers_on_project_id ON public.ci_triggers USING btree (project_id);
 
-CREATE INDEX index_ci_variables_on_project_id ON public.ci_variables USING btree (project_id) WHERE ((key)::text = 'AUTO_DEVOPS_MODSECURITY_SEC_RULE_ENGINE'::text);
-
 CREATE UNIQUE INDEX index_ci_variables_on_project_id_and_key_and_environment_scope ON public.ci_variables USING btree (project_id, key, environment_scope);
 
 CREATE UNIQUE INDEX index_cluster_groups_on_cluster_id_and_group_id ON public.cluster_groups USING btree (cluster_id, group_id);
@@ -13885,6 +13881,8 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200420172752
 20200420172927
 20200420201933
+20200421054930
+20200421054948
 20200421092907
 20200421111005
 20200421233150