Add latest changes from gitlab-org/gitlab@master

2 files changed, 21 insertions, 1 deletions

diff --git a/db/migrate/20200330132913_add_index_on_author_id_and_created_at_and_id_to_notes.rb b/db/migrate/20200330132913_add_index_on_author_id_and_created_at_and_id_to_notes.rb
new file mode 100644
index 00000000000..3b0a63ee565
--- /dev/null
+++ b/db/migrate/20200330132913_add_index_on_author_id_and_created_at_and_id_to_notes.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddIndexOnAuthorIdAndCreatedAtAndIdToNotes < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :notes, [:author_id, :created_at, :id]
+    remove_concurrent_index :notes, [:author_id, :created_at]
+  end
+
+  def down
+    add_concurrent_index :notes, [:author_id, :created_at]
+    remove_concurrent_index :notes, [:author_id, :created_at, :id]
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 86a931b6cb4..bbd6312b08a 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -9519,7 +9519,7 @@ CREATE INDEX index_namespaces_on_type_partial ON public.namespaces USING btree (
 
 CREATE UNIQUE INDEX index_note_diff_files_on_diff_note_id ON public.note_diff_files USING btree (diff_note_id);
 
-CREATE INDEX index_notes_on_author_id_and_created_at ON public.notes USING btree (author_id, created_at);
+CREATE INDEX index_notes_on_author_id_and_created_at_and_id ON public.notes USING btree (author_id, created_at, id);
 
 CREATE INDEX index_notes_on_commit_id ON public.notes USING btree (commit_id);
 
@@ -12925,5 +12925,6 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200326144443
 20200326145443
 20200330074719
+20200330132913
 \.