From f7163afb8a036468ccc3f657ac09f3c09b318dab Mon Sep 17 00:00:00 2001 From: Luke Duncalfe Date: Thu, 6 Jun 2019 18:51:50 +1200 Subject: CE backport for changes in EE MR 13894 This backports to CE changes that allow the recording of the repository_type in the table lfs_objects_projects. This is in order to allow future pruning of unreferenced LFS objects, as we will need to know which repository to look in for the LFS pointer file. The EE MR that contains the original code and a full explanation of the changes is https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894 EE Issue https://gitlab.com/gitlab-org/gitlab-ee/issues/9490 Note that there was a lot of CE code changed in the EE MR because we want to allow the wiki repository to also use LFS. See https://gitlab.com/gitlab-org/gitlab-ce/issues/43721. As the wiki is an unlicensed feature, a full backport is required to enable this. --- ...014139_add_repository_type_to_lfs_objects_project.rb | 11 +++++++++++ ...7_add_lfs_object_id_index_to_lfs_objects_projects.rb | 17 +++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 db/migrate/20190602014139_add_repository_type_to_lfs_objects_project.rb create mode 100644 db/migrate/20190606034427_add_lfs_object_id_index_to_lfs_objects_projects.rb (limited to 'db/migrate') diff --git a/db/migrate/20190602014139_add_repository_type_to_lfs_objects_project.rb b/db/migrate/20190602014139_add_repository_type_to_lfs_objects_project.rb new file mode 100644 index 00000000000..6ff64ba12a9 --- /dev/null +++ b/db/migrate/20190602014139_add_repository_type_to_lfs_objects_project.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class AddRepositoryTypeToLfsObjectsProject < ActiveRecord::Migration[5.1] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def change + add_column :lfs_objects_projects, :repository_type, :integer, limit: 2, null: true + end +end diff --git a/db/migrate/20190606034427_add_lfs_object_id_index_to_lfs_objects_projects.rb b/db/migrate/20190606034427_add_lfs_object_id_index_to_lfs_objects_projects.rb new file mode 100644 index 00000000000..fc09fcfae0f --- /dev/null +++ b/db/migrate/20190606034427_add_lfs_object_id_index_to_lfs_objects_projects.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class AddLfsObjectIdIndexToLfsObjectsProjects < ActiveRecord::Migration[5.1] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_concurrent_index :lfs_objects_projects, :lfs_object_id + end + + def down + remove_concurrent_index :lfs_objects_projects, :lfs_object_id + end +end -- cgit v1.2.1