From 39ec4d1c2824dafccc0d59bd0cfa3abce7d9154c Mon Sep 17 00:00:00 2001 From: Mario de la Ossa Date: Tue, 11 Jun 2019 22:35:19 -0600 Subject: Backport of 12014-incremental-es-wiki-updates Bringing in the DB migration and some light changes for CE classes --- .../20190607205656_add_wiki_columns_to_index_status.rb | 12 ++++++++++++ db/schema.rb | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 db/migrate/20190607205656_add_wiki_columns_to_index_status.rb (limited to 'db') diff --git a/db/migrate/20190607205656_add_wiki_columns_to_index_status.rb b/db/migrate/20190607205656_add_wiki_columns_to_index_status.rb new file mode 100644 index 00000000000..0910d425212 --- /dev/null +++ b/db/migrate/20190607205656_add_wiki_columns_to_index_status.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +class AddWikiColumnsToIndexStatus < ActiveRecord::Migration[5.1] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def change + add_column :index_statuses, :last_wiki_commit, :binary + add_column :index_statuses, :wiki_indexed_at, :datetime_with_timezone + end +end diff --git a/db/schema.rb b/db/schema.rb index a9643d70966..7a7319c132e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1572,6 +1572,8 @@ ActiveRecord::Schema.define(version: 20190613030606) do t.string "last_commit" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.binary "last_wiki_commit" + t.datetime_with_timezone "wiki_indexed_at" t.index ["project_id"], name: "index_index_statuses_on_project_id", unique: true, using: :btree end -- cgit v1.2.3 From 6c0bc9abdd2542cc0951bd34b150a5824b987636 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 19 Jun 2019 11:06:47 -0700 Subject: Remove import columns from projects table In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21497, we migrated all project import data into a separate table, `project_import_data`. In addition, we also added: ``` ignore_column :import_status, :import_jid, :import_error ``` In https://gitlab.com/gitlab-com/gl-infra/production/issues/908, we observed some of these `import_error` columns consumed megabytes of error backtraces and caused slow loading of projects whenever a `SELECT * from projects` query loaded the row into memory. Since we have long migrated away from these columns, we can now drop these columns entirely. --- .../20190619175843_remove_import_columns_from_projects.rb | 14 ++++++++++++++ db/schema.rb | 5 +---- 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 db/post_migrate/20190619175843_remove_import_columns_from_projects.rb (limited to 'db') diff --git a/db/post_migrate/20190619175843_remove_import_columns_from_projects.rb b/db/post_migrate/20190619175843_remove_import_columns_from_projects.rb new file mode 100644 index 00000000000..85f776ac99c --- /dev/null +++ b/db/post_migrate/20190619175843_remove_import_columns_from_projects.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +class RemoveImportColumnsFromProjects < ActiveRecord::Migration[5.1] + include Gitlab::Database::MigrationHelpers + + # Set this constant to true if this migration requires downtime. + DOWNTIME = false + + def change + remove_column :projects, :import_status, :string + remove_column :projects, :import_jid, :string + remove_column :projects, :import_error, :text + end +end diff --git a/db/schema.rb b/db/schema.rb index 7a7319c132e..4e333633a8b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20190613030606) do +ActiveRecord::Schema.define(version: 20190619175843) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -2595,11 +2595,9 @@ ActiveRecord::Schema.define(version: 20190613030606) do t.integer "visibility_level", default: 0, null: false t.boolean "archived", default: false, null: false t.string "avatar" - t.string "import_status" t.integer "star_count", default: 0, null: false t.string "import_type" t.string "import_source" - t.text "import_error" t.boolean "shared_runners_enabled", default: true, null: false t.string "runners_token" t.string "build_coverage_regex" @@ -2621,7 +2619,6 @@ ActiveRecord::Schema.define(version: 20190613030606) do t.boolean "only_allow_merge_if_all_discussions_are_resolved" t.boolean "printing_merge_request_link_enabled", default: true, null: false t.integer "auto_cancel_pending_pipelines", default: 1, null: false - t.string "import_jid" t.integer "cached_markdown_version" t.text "delete_error" t.datetime "last_repository_updated_at" -- cgit v1.2.3