Add common relationship methods to Model\ContactRelation

[friendica.git] / src / Worker / DBClean.php

diff --git a/src/Worker/DBClean.php b/src/Worker/DBClean.php
index 7fbc65e29ee111aa30fe789e3cedb33820db6931..4fcef805ffeb10488fe3681bcd3523b168e7fde3 100644 (file)
--- a/src/Worker/DBClean.php
+++ b/src/Worker/DBClean.php
@@ -71,7 +71,7 @@ class DBClean {
         *  3:    Orphaned data from thread table.
         *  4:    Orphaned data from notify table.
         *  5:    Orphaned data from notify-threads table.
-        *  6:    Orphaned data from sign table.
+        *  6:    Legacy functionality (removed)
         *  7:    Orphaned data from term table.
         *  8:    Expired threads.
         *  9:    Old global item entries from expired threads.
@@ -98,7 +98,7 @@ class DBClean {
                        $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` FROM `item` WHERE `uid` = 0 AND
+                       $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);
@@ -107,7 +107,7 @@ class DBClean {
                                Logger::log("found global item orphans: ".$count);
                                while ($orphan = DBA::fetch($r)) {
                                        $last_id = $orphan["id"];
-                                       Logger::notice('Delete global orphan item', ['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);
@@ -122,7 +122,7 @@ class DBClean {
                        $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` FROM `item`
+                       $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);
@@ -130,7 +130,7 @@ class DBClean {
                                Logger::log("found item orphans without parents: ".$count);
                                while ($orphan = DBA::fetch($r)) {
                                        $last_id = $orphan["id"];
-                                       Logger::notice('Delete orphan item', ['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);
@@ -224,57 +224,11 @@ class DBClean {
                                DI::config()->set('system', 'finished-dbclean-5', true);
                        }
                } elseif ($stage == 6) {
-                       $last_id = DI::config()->get('system', 'dbclean-last-id-6', 0);
-
-                       Logger::log("Deleting orphaned data from sign table. Last ID: ".$last_id);
-                       $r = DBA::p("SELECT `iid`, `id` FROM `sign`
-                                       WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `sign`.`iid`) AND `id` >= ?
-                                       ORDER BY `id` LIMIT ?", $last_id, $limit);
-                       $count = DBA::numRows($r);
-                       if ($count > 0) {
-                               Logger::log("found sign orphans: ".$count);
-                               while ($orphan = DBA::fetch($r)) {
-                                       $last_id = $orphan["id"];
-                                       DBA::delete('sign', ['iid' => $orphan["iid"]]);
-                               }
-                               Worker::add(PRIORITY_MEDIUM, 'DBClean', 6, $last_id);
-                       } else {
-                               Logger::log("No sign orphans found");
-                       }
-                       DBA::close($r);
-                       Logger::log("Done deleting ".$count." orphaned data from sign table. Last ID: ".$last_id);
-
-                       DI::config()->set('system', 'dbclean-last-id-6', $last_id);
-
-                       if ($count < $limit) {
-                               DI::config()->set('system', 'finished-dbclean-6', true);
-                       }
+                       // The legacy functionality had been removed
+                       DI::config()->set('system', 'finished-dbclean-6', true);
                } elseif ($stage == 7) {
-                       $last_id = DI::config()->get('system', 'dbclean-last-id-7', 0);
-
-                       Logger::log("Deleting orphaned data from term table. Last ID: ".$last_id);
-                       $r = DBA::p("SELECT `oid`, `tid` FROM `term`
-                                       WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `term`.`oid`) AND `tid` >= ?
-                                       ORDER BY `tid` LIMIT ?", $last_id, $limit);
-                       $count = DBA::numRows($r);
-                       if ($count > 0) {
-                               Logger::log("found term orphans: ".$count);
-                               while ($orphan = DBA::fetch($r)) {
-                                       $last_id = $orphan["tid"];
-                                       DBA::delete('term', ['oid' => $orphan["oid"]]);
-                               }
-                               Worker::add(PRIORITY_MEDIUM, 'DBClean', 7, $last_id);
-                       } else {
-                               Logger::log("No term orphans found");
-                       }
-                       DBA::close($r);
-                       Logger::log("Done deleting ".$count." orphaned data from term table. Last ID: ".$last_id);
-
-                       DI::config()->set('system', 'dbclean-last-id-7', $last_id);
-
-                       if ($count < $limit) {
-                               DI::config()->set('system', 'finished-dbclean-7', true);
-                       }
+                       // The legacy functionality had been removed
+                       DI::config()->set('system', 'finished-dbclean-7', true);
                } elseif ($stage == 8) {
                        if ($days <= 0) {
                                return;
@@ -319,7 +273,7 @@ class DBClean {
                        $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` FROM `item` WHERE `uid` = 0 AND
+                       $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);
@@ -328,7 +282,7 @@ class DBClean {
                                Logger::log("found global item entries from expired threads: ".$count);
                                while ($orphan = DBA::fetch($r)) {
                                        $last_id = $orphan["id"];
-                                       Logger::notice('Delete expired thread item', ['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);