Post expiry: Limit for deletions

diff --git a/src/Worker/ExpirePosts.php b/src/Worker/ExpirePosts.php
index f8d2432679f3dab2d319ec567166fed475997f50..09684fccc481a7198cb6dbc1586adf41c597766e 100644 (file)
--- a/src/Worker/ExpirePosts.php
+++ b/src/Worker/ExpirePosts.php
@@ -39,35 +39,48 @@ class ExpirePosts
                        $expire_days_unclaimed = $expire_days;
                }
 
+               $limit = DI::config()->get('system', 'dbclean-expire-limit');
+               if (empty($limit)) {
+                       return;
+               }
+
                if (!empty($expire_days)) {
-                       Logger::notice('Start deleting expired threads', ['expiry_days' => $expire_days]);
-                       $ret = DBA::e("DELETE FROM `item-uri` WHERE `id` IN
-                               (SELECT `uri-id` FROM `thread`
-                               INNER JOIN `contact` ON `id` = `contact-id` AND NOT `notify_new_posts`
-                               WHERE `received` < UTC_TIMESTAMP() - INTERVAL ? DAY
-                                       AND NOT `mention` AND NOT `starred` AND NOT `wall` AND NOT `origin`
-                                       AND `thread`.`uid` != 0 AND NOT `iid` IN (SELECT `parent` FROM `item`
-                                               WHERE (`item`.`starred` OR (`item`.`resource-id` != '')
-                                                       OR (`item`.`event-id` != '') OR (`item`.`attach` != '')
-                                                       OR `item`.`wall` OR `item`.`origin`
-                                                       OR `uri-id` IN (SELECT `uri-id` FROM `post-category`
-                                                               WHERE `uri-id` = `item`.`uri-id`))
-                                                       AND `item`.`parent` = `thread`.`iid`))", $expire_days);
+                       do {
+                               Logger::notice('Start deleting expired threads', ['expiry_days' => $expire_days]);
+                               $ret = DBA::e("DELETE FROM `item-uri` WHERE `id` IN
+                                       (SELECT `uri-id` FROM `thread`
+                                       INNER JOIN `contact` ON `id` = `contact-id` AND NOT `notify_new_posts`
+                                       WHERE `received` < UTC_TIMESTAMP() - INTERVAL ? DAY
+                                               AND NOT `mention` AND NOT `starred` AND NOT `wall` AND NOT `origin`
+                                               AND `thread`.`uid` != 0 AND NOT `iid` IN (SELECT `parent` FROM `item`
+                                                       WHERE (`item`.`starred` OR (`item`.`resource-id` != '')
+                                                               OR (`item`.`event-id` != '') OR (`item`.`attach` != '')
+                                                               OR `item`.`wall` OR `item`.`origin`
+                                                               OR `uri-id` IN (SELECT `uri-id` FROM `post-category`
+                                                                       WHERE `uri-id` = `item`.`uri-id`))
+                                                               AND `item`.`parent` = `thread`.`iid`))
+                                       ORDER BY `id` LIMIT ?", $expire_days, $limit);
 
-                       Logger::notice('Deleted expired threads', ['result' => $ret, 'rows' => DBA::affectedRows()]);
+                               $rows = DBA::affectedRows();
+                               Logger::notice('Deleted expired threads', ['result' => $ret, 'rows' => $rows]);
+                       } while ($rows >= $limit);
                }
 
                if (!empty($expire_days_unclaimed)) {
                        $expiry_date = DateTimeFormat::utc('now - ' . $expire_days_unclaimed . ' days', DateTimeFormat::MYSQL);
 
-                       Logger::notice('Start deleting unclaimed public items', ['expiry_days' => $expire_days_unclaimed, 'expired' => $expiry_date]);
-                       $ret = DBA::e("DELETE FROM `item-uri` WHERE `id` IN
-                               (SELECT `uri-id` FROM `item` WHERE `gravity` = ? AND `uid` = ? AND `received` < ?
-                                       AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `item` WHERE `uid` != ?)
-                                       AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `item` WHERE `uid` = ? AND `received` > ?))",
-                               GRAVITY_PARENT, 0, $expiry_date, 0, 0, $expiry_date);
+                       do {
+                               Logger::notice('Start deleting unclaimed public items', ['expiry_days' => $expire_days_unclaimed, 'expired' => $expiry_date]);
+                               $ret = DBA::e("DELETE FROM `item-uri` WHERE `id` IN
+                                       (SELECT `uri-id` FROM `item` WHERE `gravity` = ? AND `uid` = ? AND `received` < ?
+                                               AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `item` WHERE `uid` != ?)
+                                               AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `item` WHERE `uid` = ? AND `received` > ?))
+                                       ORDER BY `id` LIMIT ?",
+                                       GRAVITY_PARENT, 0, $expiry_date, 0, 0, $expiry_date, $limit);
 
-                       Logger::notice('Deleted unclaimed public items', ['result' => $ret, 'rows' => DBA::affectedRows()]);
+                               $rows = DBA::affectedRows();
+                               Logger::notice('Deleted unclaimed public items', ['result' => $ret, 'rows' => $rows]);
+                       } while ($rows >= $limit);
                }
        }
 }

diff --git a/static/defaults.config.php b/static/defaults.config.php
index 18b70d3c152f6e000adeb4c28880589abcc5e873..4174ebcad917d64dcb4ede8ce12984ceebb937d3 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -187,7 +187,8 @@ return [
 
                // dbclean-expire-limit (Integer)
                // This defines the number of items that are to be deleted in a single call.
-               // Reduce this value when you are getting memory issues.
+               // Reduce this value when you are getting lock issues.
+               // A value of 0 disables the deletion process.
                'dbclean-expire-limit' => 1000,
 
                // diaspora_test (Boolean)