Commit a62203ed authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch '213962-remove-feature-flag-for-usage_ping_batch_counter' into 'master'

Remove feature flag for usage ping batch counter

Closes #213962

See merge request gitlab-org/gitlab!33673
parents 11070779 9690e747
This diff is collapsed.
......@@ -40,7 +40,7 @@ module Gitlab
FALLBACK = -1
def count(relation, column = nil, batch: true, start: nil, finish: nil)
if batch && Feature.enabled?(:usage_ping_batch_counter, default_enabled: true)
if batch
Gitlab::Database::BatchCount.batch_count(relation, column, start: start, finish: finish)
else
relation.count
......@@ -50,7 +50,7 @@ module Gitlab
end
def distinct_count(relation, column = nil, batch: true, batch_size: nil, start: nil, finish: nil)
if batch && Feature.enabled?(:usage_ping_batch_counter, default_enabled: true)
if batch
Gitlab::Database::BatchCount.batch_distinct_count(relation, column, batch_size: batch_size, start: start, finish: finish)
else
relation.distinct_count_by(column)
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment