From bb8f2520b4254c9dabe377df48e29c5f17894a1d Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira Date: Wed, 16 May 2018 12:46:18 -0300 Subject: Persist truncated note diffs on a new table We request Gitaly in a N+1 manner to build discussion diffs. Once the diffs are from different revisions, it's hard to make a single request to the service in order to build the whole response. With this change we solve this problem and simplify a lot fetching this piece of info. --- db/schema.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'db/schema.rb') diff --git a/db/schema.rb b/db/schema.rb index 37d336b9928..884e333874c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1302,6 +1302,20 @@ ActiveRecord::Schema.define(version: 20180521171529) do add_index "namespaces", ["runners_token"], name: "index_namespaces_on_runners_token", unique: true, using: :btree add_index "namespaces", ["type"], name: "index_namespaces_on_type", using: :btree + create_table "note_diff_files", force: :cascade do |t| + t.integer "diff_note_id", null: false + t.text "diff", null: false + t.boolean "new_file", null: false + t.boolean "renamed_file", null: false + t.boolean "deleted_file", null: false + t.string "a_mode", null: false + t.string "b_mode", null: false + t.text "new_path", null: false + t.text "old_path", null: false + end + + add_index "note_diff_files", ["diff_note_id"], name: "index_note_diff_files_on_diff_note_id", unique: true, using: :btree + create_table "notes", force: :cascade do |t| t.text "note" t.string "noteable_type" @@ -2243,6 +2257,7 @@ ActiveRecord::Schema.define(version: 20180521171529) do add_foreign_key "merge_requests_closing_issues", "merge_requests", on_delete: :cascade add_foreign_key "milestones", "namespaces", column: "group_id", name: "fk_95650a40d4", on_delete: :cascade add_foreign_key "milestones", "projects", name: "fk_9bd0a0c791", on_delete: :cascade + add_foreign_key "note_diff_files", "notes", column: "diff_note_id", on_delete: :cascade add_foreign_key "notes", "projects", name: "fk_99e097b079", on_delete: :cascade add_foreign_key "oauth_openid_requests", "oauth_access_grants", column: "access_grant_id", name: "fk_oauth_openid_requests_oauth_access_grants_access_grant_id" add_foreign_key "pages_domains", "projects", name: "fk_ea2f6dfc6f", on_delete: :cascade -- cgit v1.2.1 From 709dd237601f3f7e30a3c8949e2f5c045af77f9c Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Thu, 24 May 2018 15:34:14 +0200 Subject: Added partial index for merge requests This index is added on `(target_project_id, iid)` and has a `WHERE state = 'opened'` condition. Using this index we can drastically improve the performance of the query used to count the total number of merge requests in a group. Without this index the query would eventually perform the following: -> Index Scan using index_merge_requests_on_target_project_id_and_iid on merge_requests (cost=0.43..4.89 rows=7 width=4) (actual time=0.058..0.353 rows=6 loops=228) Index Cond: (target_project_id = projects.id) Filter: ((state)::text = 'opened'::text) Rows Removed by Filter: 141 Buffers: shared hit=34351 dirtied=1 Out of the ~180 milliseconds the entire query would take, around 170 milliseconds was spent in just this segment. With the index in place, the above segment is turned into the following: -> Index Only Scan using yorick_test on merge_requests (cost=0.42..0.55 rows=7 width=4) (actual time=0.004..0.010 rows=6 loops=228) Index Cond: (target_project_id = projects.id) Heap Fetches: 419 Buffers: shared hit=1381 The index also reduces the total query time to roughly 10 milliseconds. --- db/schema.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'db/schema.rb') diff --git a/db/schema.rb b/db/schema.rb index 884e333874c..a3e33c1d9aa 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180521171529) do +ActiveRecord::Schema.define(version: 20180524132016) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -1232,6 +1232,7 @@ ActiveRecord::Schema.define(version: 20180521171529) do add_index "merge_requests", ["source_project_id", "source_branch"], name: "index_merge_requests_on_source_project_id_and_source_branch", using: :btree add_index "merge_requests", ["target_branch"], name: "index_merge_requests_on_target_branch", using: :btree add_index "merge_requests", ["target_project_id", "iid"], name: "index_merge_requests_on_target_project_id_and_iid", unique: true, using: :btree + add_index "merge_requests", ["target_project_id", "iid"], name: "index_merge_requests_on_target_project_id_and_iid_opened", where: "((state)::text = 'opened'::text)", using: :btree add_index "merge_requests", ["target_project_id", "merge_commit_sha", "id"], name: "index_merge_requests_on_tp_id_and_merge_commit_sha_and_id", using: :btree add_index "merge_requests", ["title"], name: "index_merge_requests_on_title", using: :btree add_index "merge_requests", ["title"], name: "index_merge_requests_on_title_trigram", using: :gin, opclasses: {"title"=>"gin_trgm_ops"} -- cgit v1.2.1 From 4a344a154949fc9ba72cd6e122fe4e24d952ff3f Mon Sep 17 00:00:00 2001 From: Tiago Botelho Date: Tue, 29 May 2018 10:43:06 +0100 Subject: Adds migration to ensure all remote mirror columns get created --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'db/schema.rb') diff --git a/db/schema.rb b/db/schema.rb index a3e33c1d9aa..932b7f8da02 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180524132016) do +ActiveRecord::Schema.define(version: 20180529093006) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" -- cgit v1.2.1