Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

5 files changed, 159 insertions, 6 deletions

diff --git a/lib/gitlab/database/partitioning/detached_partition_dropper.rb b/lib/gitlab/database/partitioning/detached_partition_dropper.rb
index 593824384b5..5e32ecad4ca 100644
--- a/lib/gitlab/database/partitioning/detached_partition_dropper.rb
+++ b/lib/gitlab/database/partitioning/detached_partition_dropper.rb
@@ -4,8 +4,6 @@ module Gitlab
     module Partitioning
       class DetachedPartitionDropper
         def perform
-          return unless Feature.enabled?(:drop_detached_partitions, default_enabled: :yaml)
-
           Gitlab::AppLogger.info(message: "Checking for previously detached partitions to drop")
 
           Postgresql::DetachedPartition.ready_to_drop.find_each do |detached_partition|
diff --git a/lib/gitlab/database/partitioning/monthly_strategy.rb b/lib/gitlab/database/partitioning/monthly_strategy.rb
index c93e775d7ed..9c8cccb3dc6 100644
--- a/lib/gitlab/database/partitioning/monthly_strategy.rb
+++ b/lib/gitlab/database/partitioning/monthly_strategy.rb
@@ -36,6 +36,10 @@ module Gitlab
           partitions
         end
 
+        def after_adding_partitions
+          # No-op, required by the partition manager
+        end
+
         private
 
         def desired_partitions
diff --git a/lib/gitlab/database/partitioning/partition_manager.rb b/lib/gitlab/database/partitioning/partition_manager.rb
index 8742c0ff166..aa824dfbd2f 100644
--- a/lib/gitlab/database/partitioning/partition_manager.rb
+++ b/lib/gitlab/database/partitioning/partition_manager.rb
@@ -25,10 +25,8 @@ module Gitlab
             partitions_to_create = missing_partitions
             create(partitions_to_create) unless partitions_to_create.empty?
 
-            if Feature.enabled?(:partition_pruning, default_enabled: :yaml)
-              partitions_to_detach = extra_partitions
-              detach(partitions_to_detach) unless partitions_to_detach.empty?
-            end
+            partitions_to_detach = extra_partitions
+            detach(partitions_to_detach) unless partitions_to_detach.empty?
           end
         rescue StandardError => e
           Gitlab::AppLogger.error(message: "Failed to create / detach partition(s)",
@@ -73,6 +71,8 @@ module Gitlab
                                        partition_name: partition.partition_name,
                                        table_name: partition.table)
               end
+
+              model.partitioning_strategy.after_adding_partitions
             end
           end
         end
diff --git a/lib/gitlab/database/partitioning/single_numeric_list_partition.rb b/lib/gitlab/database/partitioning/single_numeric_list_partition.rb
new file mode 100644
index 00000000000..23ac73a0e53
--- /dev/null
+++ b/lib/gitlab/database/partitioning/single_numeric_list_partition.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Database
+    module Partitioning
+      class SingleNumericListPartition
+        include Comparable
+
+        def self.from_sql(table, partition_name, definition)
+          # A list partition can support multiple values, but we only support a single number
+          matches = definition.match(/FOR VALUES IN \('(?<value>\d+)'\)/)
+
+          raise ArgumentError, 'Unknown partition definition' unless matches
+
+          value = Integer(matches[:value])
+
+          new(table, value, partition_name: partition_name)
+        end
+
+        attr_reader :table, :value
+
+        def initialize(table, value, partition_name: nil )
+          @table = table
+          @value = value
+          @partition_name = partition_name
+        end
+
+        def partition_name
+          @partition_name || "#{table}_#{value}"
+        end
+
+        def to_sql
+          <<~SQL
+            CREATE TABLE IF NOT EXISTS #{fully_qualified_partition}
+            PARTITION OF #{conn.quote_table_name(table)}
+            FOR VALUES IN (#{conn.quote(value)})
+          SQL
+        end
+
+        def to_detach_sql
+          <<~SQL
+            ALTER TABLE #{conn.quote_table_name(table)}
+            DETACH PARTITION #{fully_qualified_partition}
+          SQL
+        end
+
+        def ==(other)
+          table == other.table &&
+            partition_name == other.partition_name &&
+            value == other.value
+        end
+        alias_method :eql?, :==
+
+        def hash
+          [table, partition_name, value].hash
+        end
+
+        def <=>(other)
+          return if table != other.table
+
+          value <=> other.value
+        end
+
+        private
+
+        def fully_qualified_partition
+          "%s.%s" % [conn.quote_table_name(Gitlab::Database::DYNAMIC_PARTITIONS_SCHEMA), conn.quote_table_name(partition_name)]
+        end
+
+        def conn
+          @conn ||= Gitlab::Database::SharedModel.connection
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/database/partitioning/sliding_list_strategy.rb b/lib/gitlab/database/partitioning/sliding_list_strategy.rb
new file mode 100644
index 00000000000..21b86b43ae7
--- /dev/null
+++ b/lib/gitlab/database/partitioning/sliding_list_strategy.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Database
+    module Partitioning
+      class SlidingListStrategy
+        attr_reader :model, :partitioning_key, :next_partition_if, :detach_partition_if
+
+        delegate :table_name, to: :model
+
+        def initialize(model, partitioning_key, next_partition_if:, detach_partition_if:)
+          @model = model
+          @partitioning_key = partitioning_key
+          @next_partition_if = next_partition_if
+          @detach_partition_if = detach_partition_if
+
+          ensure_partitioning_column_ignored!
+        end
+
+        def current_partitions
+          Gitlab::Database::PostgresPartition.for_parent_table(table_name).map do |partition|
+            SingleNumericListPartition.from_sql(table_name, partition.name, partition.condition)
+          end.sort
+        end
+
+        def missing_partitions
+          if no_partitions_exist?
+            [initial_partition]
+          elsif next_partition_if.call(active_partition.value)
+            [next_partition]
+          else
+            []
+          end
+        end
+
+        def initial_partition
+          SingleNumericListPartition.new(table_name, 1)
+        end
+
+        def next_partition
+          SingleNumericListPartition.new(table_name, active_partition.value + 1)
+        end
+
+        def extra_partitions
+          possibly_extra = current_partitions[0...-1] # Never consider the most recent partition
+
+          possibly_extra.take_while { |p| detach_partition_if.call(p.value) }
+        end
+
+        def after_adding_partitions
+          active_value = active_partition.value
+          model.connection.change_column_default(model.table_name, partitioning_key, active_value)
+        end
+
+        def active_partition
+          # The current partitions list is sorted, so the last partition has the highest value
+          # This is the only partition that receives inserts.
+          current_partitions.last
+        end
+
+        def no_partitions_exist?
+          current_partitions.empty?
+        end
+
+        private
+
+        def ensure_partitioning_column_ignored!
+          unless model.ignored_columns.include?(partitioning_key.to_s)
+            raise "Add #{partitioning_key} to #{model.name}.ignored_columns to use it with SlidingListStrategy"
+          end
+        end
+      end
+    end
+  end
+end