]> git.mxchange.org Git - friendica.git/commitdiff
Replace "dbclean" with new expiry functionality
authorMichael <heluecht@pirati.ca>
Thu, 15 Oct 2020 06:02:17 +0000 (06:02 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 15 Oct 2020 06:02:17 +0000 (06:02 +0000)
src/Worker/Cron.php
src/Worker/DBClean.php [deleted file]
src/Worker/ExpirePosts.php [new file with mode: 0644]
src/Worker/RepairDatabase.php

index 8ede97c2e48783ef891a9b24240e46798a49a7a9..5e2a6a0695bb9b929fa8fe49a60234e34a956c97 100644 (file)
@@ -72,9 +72,6 @@ class Cron
                // Call possible post update functions
                Worker::add(PRIORITY_LOW, 'PostUpdate');
 
-               // Repair entries in the database
-               Worker::add(PRIORITY_LOW, 'RepairDatabase');
-
                // Hourly cron calls
                if (DI::config()->get('system', 'last_cron_hourly', 0) + 3600 < time()) {
 
@@ -93,6 +90,9 @@ class Cron
                        // Clear cache entries
                        Worker::add(PRIORITY_LOW, 'ClearCache');
 
+                       // Repair entries in the database
+                       Worker::add(PRIORITY_LOW, 'RepairDatabase');
+
                        DI::config()->set('system', 'last_cron_hourly', time());
                }
 
@@ -110,7 +110,7 @@ class Cron
 
                        Worker::add(PRIORITY_LOW, 'Expire');
 
-                       Worker::add(PRIORITY_MEDIUM, 'DBClean');
+                       Worker::add(PRIORITY_LOW, 'ExpirePosts');
 
                        Worker::add(PRIORITY_LOW, 'ExpireConversations');
 
diff --git a/src/Worker/DBClean.php b/src/Worker/DBClean.php
deleted file mode 100644 (file)
index 77eaa8d..0000000
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2020, Friendica
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-namespace Friendica\Worker;
-
-use Friendica\Core\Logger;
-use Friendica\Core\Worker;
-use Friendica\Database\DBA;
-use Friendica\DI;
-
-/**
- * The script is called from time to time to clean the database entries and remove orphaned data.
- */
-class DBClean {
-       public static function execute($stage = 0) {
-
-               if (!DI::config()->get('system', 'dbclean', false)) {
-                       return;
-               }
-
-               if ($stage == 0) {
-                       self::forkCleanProcess();
-               } else {
-                       self::removeOrphans($stage);
-               }
-       }
-
-       /**
-        * Fork the different DBClean processes
-        */
-       private static function forkCleanProcess() {
-               // Get the expire days for step 8 and 9
-               $days = DI::config()->get('system', 'dbclean-expire-days', 0);
-
-               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 (!DI::config()->get('system', 'finished-dbclean-'.$i, false) && (($i < 8) || ($i > 9) || ($days > 0))) {
-                               Worker::add(PRIORITY_LOW, 'DBClean', $i);
-                       }
-               }
-       }
-
-       /**
-        * Remove orphaned database entries
-        *
-        * @param integer $stage What should be deleted?
-        *
-        * Values for $stage:
-        * ------------------
-        *  1:    Old global item entries from item table without user copy.
-        *  2:    Items without parents.
-        *  3:    Legacy functionality (removed)
-        *  4:    Orphaned data from notify table.
-        *  5:    Legacy functionality (removed)
-        *  6:    Legacy functionality (removed)
-        *  7:    Legacy functionality (removed)
-        *  8:    Expired threads.
-        *  9:    Old global item entries from expired threads.
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-        */
-       private static function removeOrphans($stage) {
-               // We split the deletion in many small tasks
-               $limit = DI::config()->get('system', 'dbclean-expire-limit', 1000);
-
-               // Get the expire days for step 8 and 9
-               $days = DI::config()->get('system', 'dbclean-expire-days', 0);
-               $days_unclaimed = DI::config()->get('system', 'dbclean-expire-unclaimed', 90);
-
-               if ($days_unclaimed == 0) {
-                       $days_unclaimed = $days;
-               }
-
-               if ($stage == 1) {
-                       if ($days_unclaimed <= 0) {
-                               return;
-                       }
-
-                       $last_id = DI::config()->get('system', 'dbclean-last-id-1', 0);
-
-                       Logger::log("Deleting old global item entries from item table without user copy. Last ID: ".$last_id);
-                       $r = DBA::p("SELECT `id`, `guid` 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 ? DAY AND `id` >= ?
-                                       ORDER BY `id` LIMIT ?", $days_unclaimed, $last_id, $limit);
-                       $count = DBA::numRows($r);
-                       if ($count > 0) {
-                               Logger::log("found global item orphans: ".$count);
-                               while ($orphan = DBA::fetch($r)) {
-                                       $last_id = $orphan["id"];
-                                       Logger::info('Delete global orphan item', ['id' => $orphan['id'], 'guid' => $orphan['guid']]);
-                                       DBA::delete('item', ['id' => $orphan["id"]]);
-                               }
-                               Worker::add(PRIORITY_MEDIUM, 'DBClean', 1, $last_id);
-                       } else {
-                               Logger::log("No global item orphans found");
-                       }
-                       DBA::close($r);
-                       Logger::log("Done deleting ".$count." old global item entries from item table without user copy. Last ID: ".$last_id);
-
-                       DI::config()->set('system', 'dbclean-last-id-1', $last_id);
-               } elseif ($stage == 2) {
-                       $last_id = DI::config()->get('system', 'dbclean-last-id-2', 0);
-
-                       Logger::log("Deleting items without parents. Last ID: ".$last_id);
-                       $r = DBA::p("SELECT `id`, `guid` FROM `item`
-                                       WHERE NOT EXISTS (SELECT `id` FROM `item` AS `i` WHERE `item`.`parent` = `i`.`id`)
-                                       AND `id` >= ? ORDER BY `id` LIMIT ?", $last_id, $limit);
-                       $count = DBA::numRows($r);
-                       if ($count > 0) {
-                               Logger::log("found item orphans without parents: ".$count);
-                               while ($orphan = DBA::fetch($r)) {
-                                       $last_id = $orphan["id"];
-                                       Logger::info('Delete orphan item', ['id' => $orphan['id'], 'guid' => $orphan['guid']]);
-                                       DBA::delete('item', ['id' => $orphan["id"]]);
-                               }
-                               Worker::add(PRIORITY_MEDIUM, 'DBClean', 2, $last_id);
-                       } else {
-                               Logger::log("No item orphans without parents found");
-                       }
-                       DBA::close($r);
-                       Logger::log("Done deleting ".$count." items without parents. Last ID: ".$last_id);
-
-                       DI::config()->set('system', 'dbclean-last-id-2', $last_id);
-
-                       if ($count < $limit) {
-                               DI::config()->set('system', 'finished-dbclean-2', true);
-                       }
-               } elseif ($stage == 3) {
-                       // The legacy functionality had been removed
-                       DI::config()->set('system', 'finished-dbclean-3', true);
-               } elseif ($stage == 4) {
-                       DBA::p("DELETE FROM `notify` WHERE NOT `type` IN (1, 2, 16, 32, 512) AND NOT `iid` IN (SELECT `id` FROM `item`)");
-
-                       Logger::notice("Deleted orphaned data from notify table.");
-                       DI::config()->set('system', 'finished-dbclean-4', true);
-               } elseif ($stage == 5) {
-                       // The legacy functionality had been removed
-                       DI::config()->set('system', 'finished-dbclean-5', true);
-               } elseif ($stage == 6) {
-                       // The legacy functionality had been removed
-                       DI::config()->set('system', 'finished-dbclean-6', true);
-               } elseif ($stage == 7) {
-                       // The legacy functionality had been removed
-                       DI::config()->set('system', 'finished-dbclean-7', true);
-               } elseif ($stage == 8) {
-                       if ($days <= 0) {
-                               return;
-                       }
-
-                       $last_id = DI::config()->get('system', 'dbclean-last-id-8', 0);
-
-                       Logger::log("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 ?", $days, $last_id, $limit);
-                       $count = DBA::numRows($r);
-                       if ($count > 0) {
-                               Logger::log("found expired threads: ".$count);
-                               while ($thread = DBA::fetch($r)) {
-                                       $last_id = $thread["iid"];
-                                       DBA::delete('item', ['parent' => $thread["iid"]]);
-                               }
-                               Worker::add(PRIORITY_MEDIUM, 'DBClean', 8, $last_id);
-                       } else {
-                               Logger::log("No expired threads found");
-                       }
-                       DBA::close($r);
-                       Logger::log("Done deleting ".$count." expired threads. Last ID: ".$last_id);
-
-                       DI::config()->set('system', 'dbclean-last-id-8', $last_id);
-               } elseif ($stage == 9) {
-                       if ($days <= 0) {
-                               return;
-                       }
-
-                       $last_id = DI::config()->get('system', 'dbclean-last-id-9', 0);
-                       $till_id = DI::config()->get('system', 'dbclean-last-id-8', 0);
-
-                       Logger::log("Deleting old global item entries from expired threads from ID ".$last_id." to ID ".$till_id);
-                       $r = DBA::p("SELECT `id`, `guid` 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 ?", $last_id, $till_id, $limit);
-                       $count = DBA::numRows($r);
-                       if ($count > 0) {
-                               Logger::log("found global item entries from expired threads: ".$count);
-                               while ($orphan = DBA::fetch($r)) {
-                                       $last_id = $orphan["id"];
-                                       Logger::info('Delete expired thread item', ['id' => $orphan['id'], 'guid' => $orphan['guid']]);
-                                       DBA::delete('item', ['id' => $orphan["id"]]);
-                               }
-                               Worker::add(PRIORITY_MEDIUM, 'DBClean', 9, $last_id);
-                       } else {
-                               Logger::log("No global item entries from expired threads");
-                       }
-                       DBA::close($r);
-                       Logger::log("Done deleting ".$count." old global item entries from expired threads. Last ID: ".$last_id);
-
-                       DI::config()->set('system', 'dbclean-last-id-9', $last_id);
-               }
-       }
-}
diff --git a/src/Worker/ExpirePosts.php b/src/Worker/ExpirePosts.php
new file mode 100644 (file)
index 0000000..2213646
--- /dev/null
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Worker;
+
+use Friendica\Core\Logger;
+use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Util\DateTimeFormat;
+
+class ExpirePosts
+{
+       /**
+        * Delete old post entries
+        */
+       public static function execute()
+       {
+               $expire_days = DI::config()->get('system', 'dbclean-expire-days');
+               $expire_days_unclaimed = DI::config()->get('system', 'dbclean-expire-unclaimed');
+               if (empty($expire_days_unclaimed)) {
+                       $expire_days_unclaimed = $expire_days;
+               }
+
+               if (!empty($expire_days)) {
+                       Logger::notice('Start deleting expired threads', ['expiry_days' => $expire_days, 'count' => DBA::count('item')]);
+                       $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);
+
+                       Logger::notice('Deleted expired threads', ['result' => $ret, 'rows' => DBA::affectedRows(), 'count' => DBA::count('item')]);
+               }
+
+               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, 'count' => DBA::count('item')]);
+                       $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);
+
+                       Logger::notice('Deleted unclaimed public items', ['result' => $ret, 'rows' => DBA::affectedRows(), 'count' => DBA::count('item')]);
+               }
+       }
+}
index 076974d0958ddce3080d337a9ecc63afe1d77168..655e99520b743de1be9b414353e8c8da575ad975 100644 (file)
 
 namespace Friendica\Worker;
 
-use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
 use Friendica\Model\ItemURI;
-use Friendica\Util\Strings;
 
 /**
  * Do some repairs in database entries
@@ -36,37 +32,6 @@ class RepairDatabase
 {
        public static function execute()
        {
-               // Sometimes there seem to be issues where the "self" contact vanishes.
-               // We haven't found the origin of the problem by now.
-
-               $users = DBA::select('user', ['uid'], ["NOT EXISTS (SELECT `uid` FROM `contact` WHERE `contact`.`uid` = `user`.`uid` AND `contact`.`self`)"]);
-               while ($user = DBA::fetch($users)) {
-                       Logger::notice('Create missing self contact', ['user'=> $user['uid']]);
-                       Contact::createSelfFromUserId($user['uid']);
-               }
-               DBA::close($users);
-
-               // There was an issue where the nick vanishes from the contact table
-               DBA::e("UPDATE `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` SET `nick` = `nickname` WHERE `self` AND `nick`=''");
-
-               /// @todo
-               /// - remove thread entries without item
-               /// - remove sign entries without item
-               /// - remove children when parent got lost
-               /// - set contact-id in item when not present
-
-               // Add intro entries for pending contacts
-               // We don't do this for DFRN entries since such revived contact requests seem to mostly fail.
-               $pending_contacts = DBA::p("SELECT `uid`, `id`, `url`, `network`, `created` FROM `contact`
-                       WHERE `pending` AND `rel` IN (?, ?) AND `network` != ? AND `uid` != ?
-                               AND NOT EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id`)",
-                       0, Contact::FOLLOWER, Protocol::DFRN, 0);
-               while ($contact = DBA::fetch($pending_contacts)) {
-                       DBA::insert('intro', ['uid' => $contact['uid'], 'contact-id' => $contact['id'], 'blocked' => false,
-                               'hash' => Strings::getRandomHex(), 'datetime' => $contact['created']]);
-               }
-               DBA::close($pending_contacts);
-
                // Ensure that there are no "uri-id", "parent-uri-id" or "thr-parent-id" fields that are NULL
                $items = DBA::select('item', ['id', 'uri', 'guid'], ["`uri-id` IS NULL"]);
                while ($item = DBA::fetch($items)) {
@@ -88,5 +53,14 @@ class RepairDatabase
                        DBA::update('item', ['thr-parent-id' => $uriid], ['id' => $item['id']]);
                }
                DBA::close($items);
+
+               // Ensure that all uri-id are set correctly
+               DBA::e("UPDATE `item` INNER JOIN `item-uri` ON `item-uri`.`uri` = `item`.`uri`
+                       SET `uri-id` = `item-uri`.`id` WHERE `item`.`uri-id` != `item-uri`.`id`");
+               DBA::e("UPDATE `item` INNER JOIN `item-uri` ON `item-uri`.`uri` = `item`.`parent-uri`
+                       SET `parent-uri-id` = `item-uri`.`id` WHERE `item`.`parent-uri-id` != `item-uri`.`id`");
+
+               // Delete orphaned data from notify table.
+               DBA::e("DELETE FROM `notify` WHERE NOT `type` IN (1, 2, 16, 32, 512) AND NOT `iid` IN (SELECT `id` FROM `item`)");
        }
 }