Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorLuke Duncalfe <lduncalfe@eml.cc>2019-06-06 09:51:50 +0300
committerLuke Duncalfe <lduncalfe@eml.cc>2019-06-17 02:23:06 +0300
commitf7163afb8a036468ccc3f657ac09f3c09b318dab (patch)
treef935d63b744625597467489a7b11ccbb07864c8a /db
parent82822945d446acf44176a36da38675e98ca17616 (diff)
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.
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20190602014139_add_repository_type_to_lfs_objects_project.rb11
-rw-r--r--db/migrate/20190606034427_add_lfs_object_id_index_to_lfs_objects_projects.rb17
-rw-r--r--db/schema.rb2
3 files changed, 30 insertions, 0 deletions
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
diff --git a/db/schema.rb b/db/schema.rb
index 4ed7c0cb248..01a00103dd5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1190,6 +1190,8 @@ ActiveRecord::Schema.define(version: 20190611161641) do
t.integer "project_id", null: false
t.datetime "created_at"
t.datetime "updated_at"
+ t.integer "repository_type", limit: 2
+ t.index ["lfs_object_id"], name: "index_lfs_objects_projects_on_lfs_object_id", using: :btree
t.index ["project_id"], name: "index_lfs_objects_projects_on_project_id", using: :btree
end