From: abcang <abcang1015@gmail.com>
Date: Tue, 17 Sep 2019 06:44:25 +0000 (+0900)
Subject: Improve IP cleanup query (#11871)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c21386cff5ff6d86d8887e4a5dde1cf910ab84a0;p=mastodon.git

Improve IP cleanup query (#11871)
---

diff --git a/app/workers/scheduler/ip_cleanup_scheduler.rb b/app/workers/scheduler/ip_cleanup_scheduler.rb
index 42620332e..4f44078d8 100644
--- a/app/workers/scheduler/ip_cleanup_scheduler.rb
+++ b/app/workers/scheduler/ip_cleanup_scheduler.rb
@@ -9,7 +9,7 @@ class Scheduler::IpCleanupScheduler
 
   def perform
     time_ago = RETENTION_PERIOD.ago
-    SessionActivation.where('updated_at < ?', time_ago).destroy_all
-    User.where('last_sign_in_at < ?', time_ago).update_all(last_sign_in_ip: nil)
+    SessionActivation.where('updated_at < ?', time_ago).in_batches.destroy_all
+    User.where('last_sign_in_at < ?', time_ago).where.not(last_sign_in_ip: nil).in_batches.update_all(last_sign_in_ip: nil)
   end
 end