Make Hypolite happy

[friendica.git] / include / dbclean.php

diff --git a/include/dbclean.php b/include/dbclean.php
index 29c4173080f9ac6204a687573cd80b1c29b6ed12..8408ad1882fad73d9ed0df254d1caecf276b8809 100644 (file)
--- a/include/dbclean.php
+++ b/include/dbclean.php
@@ -23,8 +23,7 @@ function dbclean_run(&$argv, &$argc) {
                unset($db_host, $db_user, $db_pass, $db_data);
        }
 
-       load_config('config');
-       load_config('system');
+       Config::load();
 
        if (!Config::get('system', 'dbclean', false)) {
                return;
@@ -36,7 +35,7 @@ function dbclean_run(&$argv, &$argc) {
                $stage = 0;
        }
 
-       if (get_config("system", "worker") AND ($stage == 0)) {
+       if (Config::get("system", "worker") AND ($stage == 0)) {
                proc_run(PRIORITY_LOW, 'include/dbclean.php', 1);
                proc_run(PRIORITY_LOW, 'include/dbclean.php', 2);
                proc_run(PRIORITY_LOW, 'include/dbclean.php', 3);
@@ -57,11 +56,18 @@ function remove_orphans($stage = 0) {
 
        $count = 0;
 
+       // With activated worker we split the deletion in many small tasks
+       if (Config::get("system", "worker")) {
+               $limit = 1000;
+       } else {
+               $limit = 10000;
+       }
+
        if (($stage == 1) OR ($stage == 0)) {
                logger("Deleting old global item entries from item table without user copy");
                if ($db->q("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 LIMIT 10000", true)) {
+                               AND `received` < UTC_TIMESTAMP() - INTERVAL 90 DAY LIMIT ".intval($limit), true)) {
                        $count = $db->num_rows();
                        logger("found global item orphans: ".$count);
                        while ($orphan = $db->qfetch()) {
@@ -74,7 +80,7 @@ function remove_orphans($stage = 0) {
 
        if (($stage == 2) OR ($stage == 0)) {
                logger("Deleting items without parents");
-               if ($db->q("SELECT `id` FROM `item` WHERE NOT EXISTS (SELECT `id` FROM `item` AS `i` WHERE `item`.`parent` = `i`.`id`) LIMIT 10000", true)) {
+               if ($db->q("SELECT `id` FROM `item` WHERE NOT EXISTS (SELECT `id` FROM `item` AS `i` WHERE `item`.`parent` = `i`.`id`) LIMIT ".intval($limit), true)) {
                        $count = $db->num_rows();
                        logger("found item orphans without parents: ".$count);
                        while ($orphan = $db->qfetch()) {
@@ -87,7 +93,7 @@ function remove_orphans($stage = 0) {
 
        if (($stage == 3) OR ($stage == 0)) {
                logger("Deleting orphaned data from thread table");
-               if ($db->q("SELECT `iid` FROM `thread` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `thread`.`iid`)", true)) {
+               if ($db->q("SELECT `iid` FROM `thread` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `thread`.`iid`) LIMIT ".intval($limit), true)) {
                        $count = $db->num_rows();
                        logger("found thread orphans: ".$count);
                        while ($orphan = $db->qfetch()) {
@@ -100,7 +106,7 @@ function remove_orphans($stage = 0) {
 
        if (($stage == 4) OR ($stage == 0)) {
                logger("Deleting orphaned data from notify table");
-               if ($db->q("SELECT `iid` FROM `notify` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `notify`.`iid`)", true)) {
+               if ($db->q("SELECT `iid` FROM `notify` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `notify`.`iid`) LIMIT ".intval($limit), true)) {
                        $count = $db->num_rows();
                        logger("found notify orphans: ".$count);
                        while ($orphan = $db->qfetch()) {
@@ -113,7 +119,7 @@ function remove_orphans($stage = 0) {
 
        if (($stage == 5) OR ($stage == 0)) {
                logger("Deleting orphaned data from notify-threads table");
-               if ($db->q("SELECT `id` FROM `notify-threads` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `notify-threads`.`master-parent-item`)", true)) {
+               if ($db->q("SELECT `id` FROM `notify-threads` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `notify-threads`.`master-parent-item`) LIMIT ".intval($limit), true)) {
                        $count = $db->num_rows();
                        logger("found notify-threads orphans: ".$count);
                        while ($orphan = $db->qfetch()) {
@@ -127,7 +133,7 @@ function remove_orphans($stage = 0) {
 
        if (($stage == 6) OR ($stage == 0)) {
                logger("Deleting orphaned data from sign table");
-               if ($db->q("SELECT `iid` FROM `sign` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `sign`.`iid`)", true)) {
+               if ($db->q("SELECT `iid` FROM `sign` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `sign`.`iid`) LIMIT ".intval($limit), true)) {
                        $count = $db->num_rows();
                        logger("found sign orphans: ".$count);
                        while ($orphan = $db->qfetch()) {
@@ -141,7 +147,7 @@ function remove_orphans($stage = 0) {
 
        if (($stage == 7) OR ($stage == 0)) {
                logger("Deleting orphaned data from term table");
-               if ($db->q("SELECT `oid` FROM `term` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `term`.`oid`)", true)) {
+               if ($db->q("SELECT `oid` FROM `term` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `term`.`oid`) LIMIT ".intval($limit), true)) {
                        $count = $db->num_rows();
                        logger("found term orphans: ".$count);
                        while ($orphan = $db->qfetch()) {
@@ -153,8 +159,8 @@ function remove_orphans($stage = 0) {
        }
 
        // Call it again if not all entries were purged
-       if (($stage != 0) AND ($count > 0) AND get_config("system", "worker")) {
-               proc_run(PRIORITY_LOW, 'include/dbclean.php');
+       if (($stage != 0) AND ($count > 0) AND Config::get("system", "worker")) {
+               proc_run(PRIORITY_MEDIUM, 'include/dbclean.php');
        }
 
 }