Get rid of tracked field

It makes a debugging slightly easier, but is not necessary, and is a waste of resources.

2 files changed, 3 insertions, 13 deletions

diff --git a/lib/gitlab/background_migration/populate_untracked_uploads.rb b/lib/gitlab/background_migration/populate_untracked_uploads.rb
index b8872477e63..03e7b7b71cb 100644
--- a/lib/gitlab/background_migration/populate_untracked_uploads.rb
+++ b/lib/gitlab/background_migration/populate_untracked_uploads.rb
@@ -50,14 +50,10 @@ module Gitlab
           }
         ].freeze
 
-        scope :untracked, -> { where(tracked: false) }
-
         def ensure_tracked!
-          return if persisted? && tracked?
-
           add_to_uploads unless in_uploads?
 
-          mark_as_tracked
+          delete
         end
 
         def in_uploads?
@@ -79,10 +75,6 @@ module Gitlab
           )
         end
 
-        def mark_as_tracked
-          update!(tracked: true)
-        end
-
         def upload_path
           # UntrackedFile#path is absolute, but Upload#path depends on uploader
           if uploader == 'FileUploader'
@@ -197,7 +189,7 @@ module Gitlab
       def perform(start_id, end_id)
         return unless migrate?
 
-        files = UntrackedFile.untracked.where(id: start_id..end_id)
+        files = UntrackedFile.where(id: start_id..end_id)
         files.each do |untracked_file|
           begin
             untracked_file.ensure_tracked!
@@ -220,7 +212,7 @@ module Gitlab
       end
 
       def drop_temp_table_if_finished
-        UntrackedFile.connection.drop_table(:untracked_files_for_uploads) if UntrackedFile.untracked.empty?
+        UntrackedFile.connection.drop_table(:untracked_files_for_uploads) if UntrackedFile.all.empty?
       end
     end
   end
diff --git a/lib/gitlab/background_migration/prepare_untracked_uploads.rb b/lib/gitlab/background_migration/prepare_untracked_uploads.rb
index 8333a6218de..c076c13815d 100644
--- a/lib/gitlab/background_migration/prepare_untracked_uploads.rb
+++ b/lib/gitlab/background_migration/prepare_untracked_uploads.rb
@@ -42,10 +42,8 @@ module Gitlab
         unless UntrackedFile.connection.table_exists?(:untracked_files_for_uploads)
           UntrackedFile.connection.create_table :untracked_files_for_uploads do |t|
             t.string :path, limit: 600, null: false
-            t.boolean :tracked, default: false, null: false
             t.timestamps_with_timezone null: false
             t.index :path, unique: true
-            t.index :tracked
           end
         end
       end