1 files changed, 14 insertions, 3 deletions
diff --git a/lib/gitlab/database/postgres_index.rb b/lib/gitlab/database/postgres_index.rb
index 2a9f23f0098..6e734834841 100644
--- a/lib/gitlab/database/postgres_index.rb
+++ b/lib/gitlab/database/postgres_index.rb
@@ -3,9 +3,14 @@
 module Gitlab
   module Database
     class PostgresIndex < ActiveRecord::Base
+      include Gitlab::Utils::StrongMemoize
+
       self.table_name = 'postgres_indexes'
       self.primary_key = 'identifier'
 
+      has_one :bloat_estimate, class_name: 'Gitlab::Database::PostgresIndexBloatEstimate', foreign_key: :identifier
+      has_many :reindexing_actions, class_name: 'Gitlab::Database::Reindexing::ReindexAction', foreign_key: :index_identifier
+
       scope :by_identifier, ->(identifier) do
         raise ArgumentError, "Index name is not fully qualified with a schema: #{identifier}" unless identifier =~ /^\w+\.\w+$/
 
@@ -17,11 +22,17 @@ module Gitlab
       # is defined on a table that is not partitioned.
       scope :regular, -> { where(unique: false, partitioned: false, exclusion: false)}
 
-      scope :random_few, ->(how_many) do
-        limit(how_many).order(Arel.sql('RANDOM()'))
+      scope :not_match, ->(regex) { where("name !~ ?", regex)}
+
+      scope :not_recently_reindexed, -> do
+        recent_actions = Reindexing::ReindexAction.recent.where('index_identifier = identifier')
+
+        where('NOT EXISTS (?)', recent_actions)
       end
 
-      scope :not_match, ->(regex) { where("name !~ ?", regex)}
+      def bloat_size
+        strong_memoize(:bloat_size) { bloat_estimate&.bloat_size || 0 }
+      end
 
       def to_s
         name