Central item expiration routine for external items

diff --git a/doc/htconfig.md b/doc/htconfig.md
index b2f718296065924e00add41f6ffe575722183bf2..ce0b446def8d9650b8fd065fc116f91fcaa4a276 100644 (file)
--- a/doc/htconfig.md
+++ b/doc/htconfig.md
@@ -35,6 +35,7 @@ Example: To set the directory value please add this line to your .htconfig.php:
 * **db_loglimit_index_high** - Number of index rows to be logged anyway (for any index)
 * **db_log_index_blacklist** - Blacklist of indexes that shouldn't be watched
 * **dbclean** (Boolean) - Enable the automatic database cleanup process
+* **dbclean-expire-days** (Integer) - Days after which remote items will be deleted. Own items, and marked or filed items are kept.
 * **default_service_class** -
 * **delivery_batch_count** - Number of deliveries per process. Default value is 1. (Disabled when using the worker)
 * **diaspora_test** (Boolean) - For development only. Disables the message transfer.

diff --git a/include/dbclean.php b/include/dbclean.php
index ff4993c4a0b61a4601bda3172bed2c898fbdfc1e..024b845f7dc736a8a8fd3e0fd066676ff56a56ef 100644 (file)
--- a/include/dbclean.php
+++ b/include/dbclean.php
@@ -17,9 +17,14 @@ function dbclean_run(&$argv, &$argc) {
                $stage = 0;
        }
 
+       // Get the expire days for step 8 and 9
+       $days = Config::get('system', 'dbclean-expire-days', 0);
+
        if ($stage == 0) {
-               for ($i = 1; $i <= 7; $i++) {
-                       if (!Config::get('system', 'finished-dbclean-'.$i, false)) {
+               for ($i = 1; $i <= 9; $i++) {
+                       // Execute the background script for a step when it isn't finished.
+                       // Execute step 8 and 9 only when $days is defined.
+                       if (!Config::get('system', 'finished-dbclean-'.$i, false) AND (($i < 8) OR ($days > 0))) {
                                proc_run(PRIORITY_LOW, 'include/dbclean.php', $i);
                        }
                }
@@ -39,6 +44,9 @@ function remove_orphans($stage = 0) {
        // We split the deletion in many small tasks
        $limit = 1000;
 
+       // Get the expire days for step 8 and 9
+       $days = Config::get('system', 'dbclean-expire-days', 0);
+
        if ($stage == 1) {
                $last_id = Config::get('system', 'dbclean-last-id-1', 0);
 
@@ -61,11 +69,6 @@ function remove_orphans($stage = 0) {
                logger("Done deleting ".$count." old global item entries from item table without user copy. Last ID: ".$last_id);
 
                Config::set('system', 'dbclean-last-id-1', $last_id);
-
-               // We will eventually set this value when we found a good way to delete these items in another way.
-               // if ($count < $limit) {
-               //      Config::set('system', 'finished-dbclean-1', true);
-               // }
        } elseif ($stage == 2) {
                $last_id = Config::get('system', 'dbclean-last-id-2', 0);
 
@@ -216,11 +219,71 @@ function remove_orphans($stage = 0) {
                if ($count < $limit) {
                        Config::set('system', 'finished-dbclean-7', true);
                }
+       } elseif ($stage == 8) {
+               if ($days <= 0) {
+                       return;
+               }
+
+               $last_id = Config::get('system', 'dbclean-last-id-8', 0);
+
+               logger("Deleting expired threads. Last ID: ".$last_id);
+               $r = dba::p("SELECT `thread`.`iid` FROM `thread`
+                                INNER JOIN `contact` ON `thread`.`contact-id` = `contact`.`id` AND NOT `notify_new_posts`
+                                WHERE `thread`.`received` < UTC_TIMESTAMP() - INTERVAL ? DAY
+                                        AND NOT `thread`.`mention` AND NOT `thread`.`starred`
+                                        AND NOT `thread`.`wall` AND NOT `thread`.`origin`
+                                        AND `thread`.`uid` != 0 AND `thread`.`iid` >= ?
+                                        AND NOT `thread`.`iid` IN (SELECT `parent` FROM `item`
+                                                        WHERE (`item`.`starred` OR (`item`.`resource-id` != '')
+                                                                OR (`item`.`file` != '') OR (`item`.`event-id` != '')
+                                                                OR (`item`.`attach` != '') OR `item`.`wall` OR `item`.`origin`)
+                                                                AND `item`.`parent` = `thread`.`iid`)
+                                ORDER BY `thread`.`iid` LIMIT 1000", $days, $last_id);
+               $count = dba::num_rows($r);
+               if ($count > 0) {
+                       logger("found expired threads: ".$count);
+                       while ($thread = dba::fetch($r)) {
+                               $last_id = $thread["iid"];
+                               dba::delete('thread', array('iid' => $thread["iid"]));
+                       }
+               } else {
+                       logger("No expired threads found");
+               }
+               dba::close($r);
+               logger("Done deleting ".$count." expired threads. Last ID: ".$last_id);
+
+               Config::set('system', 'dbclean-last-id-8', $last_id);
+       } elseif ($stage == 9) {
+               if ($days <= 0) {
+                       return;
+               }
+
+               $last_id = Config::get('system', 'dbclean-last-id-9', 0);
+               $till_id = Config::get('system', 'dbclean-last-id-8', 0);
+
+               logger("Deleting old global item entries from expired threads from ID ".$last_id." to ID ".$till_id);
+               $r = dba::p("SELECT `id` FROM `item` WHERE `uid` = 0 AND
+                                       NOT EXISTS (SELECT `guid` FROM `item` AS `i` WHERE `item`.`guid` = `i`.`guid` AND `i`.`uid` != 0) AND
+                                       `received` < UTC_TIMESTAMP() - INTERVAL 90 DAY AND `id` >= ? AND `id` <= ?
+                               ORDER BY `id` LIMIT ".intval($limit), $last_id, $till_id);
+               $count = dba::num_rows($r);
+               if ($count > 0) {
+                       logger("found global item entries from expired threads: ".$count);
+                       while ($orphan = dba::fetch($r)) {
+                               $last_id = $orphan["id"];
+                               dba::delete('item', array('id' => $orphan["id"]));
+                       }
+               } else {
+                       logger("No global item entries from expired threads");
+               }
+               dba::close($r);
+               logger("Done deleting ".$count." old global item entries from expired threads. Last ID: ".$last_id);
+
+               Config::set('system', 'dbclean-last-id-9', $last_id);
        }
 
        // Call it again if not all entries were purged
        if (($stage != 0) AND ($count > 0)) {
                proc_run(PRIORITY_MEDIUM, 'include/dbclean.php');
        }
-
 }