Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 25 deletions

diff --git a/app/workers/prune_old_events_worker.rb b/app/workers/prune_old_events_worker.rb
index f421e8dbf59..1d915832833 100644
--- a/app/workers/prune_old_events_worker.rb
+++ b/app/workers/prune_old_events_worker.rb
@@ -6,18 +6,12 @@ class PruneOldEventsWorker
 
   feature_category_not_owned!
 
-  # rubocop: disable CodeReuse/ActiveRecord
+  DELETE_LIMIT = 10_000
+
   def perform
     # Contribution calendar shows maximum 12 months of events, we retain 3 years for data integrity.
-    # Double nested query is used because MySQL doesn't allow DELETE subqueries on the same table.
-    Event.unscoped.where(
-      '(id IN (SELECT id FROM (?) ids_to_remove))',
-      Event.unscoped.where(
-        'created_at < ?',
-        (3.years + 1.day).ago)
-      .select(:id)
-      .limit(10_000))
-    .delete_all
+    cutoff_date = (3.years + 1.day).ago
+
+    Event.unscoped.created_before(cutoff_date).delete_with_limit(DELETE_LIMIT)
   end
-  # rubocop: enable CodeReuse/ActiveRecord
 end
diff --git a/app/workers/prune_web_hook_logs_worker.rb b/app/workers/prune_web_hook_logs_worker.rb
index 8e48b45fc34..69a1dd43e69 100644
--- a/app/workers/prune_web_hook_logs_worker.rb
+++ b/app/workers/prune_web_hook_logs_worker.rb
@@ -11,20 +11,9 @@ class PruneWebHookLogsWorker
   # The maximum number of rows to remove in a single job.
   DELETE_LIMIT = 50_000
 
-  # rubocop: disable CodeReuse/ActiveRecord
   def perform
-    # MySQL doesn't allow "DELETE FROM ... WHERE id IN ( ... )" if the inner
-    # query refers to the same table. To work around this we wrap the IN body in
-    # another sub query.
-    WebHookLog
-      .where(
-        'id IN (SELECT id FROM (?) ids_to_remove)',
-        WebHookLog
-          .select(:id)
-          .where('created_at < ?', 90.days.ago.beginning_of_day)
-          .limit(DELETE_LIMIT)
-      )
-      .delete_all
+    cutoff_date = 90.days.ago.beginning_of_day
+
+    WebHookLog.created_before(cutoff_date).delete_with_limit(DELETE_LIMIT)
   end
-  # rubocop: enable CodeReuse/ActiveRecord
 end