X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDBClean.php;h=a722fa23b667188d39517f05e86465a7380d7d17;hb=458981f75cff2427976c9abc787eadf8e9e6267f;hp=20691c178e052f5385efd049f87ae4c1917a76f3;hpb=b1cb955110bd2649a507a0b5a72d399ea1d6c47c;p=friendica.git

diff --git a/src/Worker/DBClean.php b/src/Worker/DBClean.php
index 20691c178e..a722fa23b6 100644
--- a/src/Worker/DBClean.php
+++ b/src/Worker/DBClean.php
@@ -7,8 +7,9 @@
 namespace Friendica\Worker;
 
 use Friendica\Core\Config;
+use Friendica\Core\Logger;
 use Friendica\Core\Worker;
-use dba;
+use Friendica\Database\DBA;
 
 require_once 'include/dba.php';
 
@@ -60,12 +61,10 @@ class DBClean {
 	 * 10:	Old conversations.
 	 */
 	private static function removeOrphans($stage) {
-		global $db;
-
 		$count = 0;
 
 		// We split the deletion in many small tasks
-		$limit = 1000;
+		$limit = Config::get('system', 'dbclean-expire-limit', 1000);
 
 		// Get the expire days for step 8 and 9
 		$days = Config::get('system', 'dbclean-expire-days', 0);
@@ -82,46 +81,46 @@ class DBClean {
 
 			$last_id = Config::get('system', 'dbclean-last-id-1', 0);
 
-			logger("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
+			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
 						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 ".intval($limit), $days_unclaimed, $last_id);
-			$count = dba::num_rows($r);
+					ORDER BY `id` LIMIT ?", $days_unclaimed, $last_id, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
-				logger("found global item orphans: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				Logger::log("found global item orphans: ".$count);
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('item', ['id' => $orphan["id"]]);
+					DBA::delete('item', ['id' => $orphan["id"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 1, $last_id);
 			} else {
-				logger("No global item orphans found");
+				Logger::log("No global item orphans found");
 			}
-			dba::close($r);
-			logger("Done deleting ".$count." old global item entries from item table without user copy. Last ID: ".$last_id);
+			DBA::close($r);
+			Logger::log("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);
 		} elseif ($stage == 2) {
 			$last_id = Config::get('system', 'dbclean-last-id-2', 0);
 
-			logger("Deleting items without parents. Last ID: ".$last_id);
-			$r = dba::p("SELECT `id` FROM `item`
+			Logger::log("Deleting items without parents. Last ID: ".$last_id);
+			$r = DBA::p("SELECT `id` FROM `item`
 					WHERE NOT EXISTS (SELECT `id` FROM `item` AS `i` WHERE `item`.`parent` = `i`.`id`)
-					AND `id` >= ? ORDER BY `id` LIMIT ".intval($limit), $last_id);
-			$count = dba::num_rows($r);
+					AND `id` >= ? ORDER BY `id` LIMIT ?", $last_id, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
-				logger("found item orphans without parents: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				Logger::log("found item orphans without parents: ".$count);
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('item', ['id' => $orphan["id"]]);
+					DBA::delete('item', ['id' => $orphan["id"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 2, $last_id);
 			} else {
-				logger("No item orphans without parents found");
+				Logger::log("No item orphans without parents found");
 			}
-			dba::close($r);
-			logger("Done deleting ".$count." items without parents. Last ID: ".$last_id);
+			DBA::close($r);
+			Logger::log("Done deleting ".$count." items without parents. Last ID: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-2', $last_id);
 
@@ -131,23 +130,23 @@ class DBClean {
 		} elseif ($stage == 3) {
 			$last_id = Config::get('system', 'dbclean-last-id-3', 0);
 
-			logger("Deleting orphaned data from thread table. Last ID: ".$last_id);
-			$r = dba::p("SELECT `iid` FROM `thread`
+			Logger::log("Deleting orphaned data from thread table. Last ID: ".$last_id);
+			$r = DBA::p("SELECT `iid` FROM `thread`
 					WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `thread`.`iid`) AND `iid` >= ?
-					ORDER BY `iid` LIMIT ".intval($limit), $last_id);
-			$count = dba::num_rows($r);
+					ORDER BY `iid` LIMIT ?", $last_id, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
-				logger("found thread orphans: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				Logger::log("found thread orphans: ".$count);
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["iid"];
-					dba::delete('thread', ['iid' => $orphan["iid"]]);
+					DBA::delete('thread', ['iid' => $orphan["iid"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 3, $last_id);
 			} else {
-				logger("No thread orphans found");
+				Logger::log("No thread orphans found");
 			}
-			dba::close($r);
-			logger("Done deleting ".$count." orphaned data from thread table. Last ID: ".$last_id);
+			DBA::close($r);
+			Logger::log("Done deleting ".$count." orphaned data from thread table. Last ID: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-3', $last_id);
 
@@ -157,23 +156,23 @@ class DBClean {
 		} elseif ($stage == 4) {
 			$last_id = Config::get('system', 'dbclean-last-id-4', 0);
 
-			logger("Deleting orphaned data from notify table. Last ID: ".$last_id);
-			$r = dba::p("SELECT `iid`, `id` FROM `notify`
+			Logger::log("Deleting orphaned data from notify table. Last ID: ".$last_id);
+			$r = DBA::p("SELECT `iid`, `id` FROM `notify`
 					WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `notify`.`iid`) AND `id` >= ?
-					ORDER BY `id` LIMIT ".intval($limit), $last_id);
-			$count = dba::num_rows($r);
+					ORDER BY `id` LIMIT ?", $last_id, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
-				logger("found notify orphans: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				Logger::log("found notify orphans: ".$count);
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('notify', ['iid' => $orphan["iid"]]);
+					DBA::delete('notify', ['iid' => $orphan["iid"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 4, $last_id);
 			} else {
-				logger("No notify orphans found");
+				Logger::log("No notify orphans found");
 			}
-			dba::close($r);
-			logger("Done deleting ".$count." orphaned data from notify table. Last ID: ".$last_id);
+			DBA::close($r);
+			Logger::log("Done deleting ".$count." orphaned data from notify table. Last ID: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-4', $last_id);
 
@@ -183,23 +182,23 @@ class DBClean {
 		} elseif ($stage == 5) {
 			$last_id = Config::get('system', 'dbclean-last-id-5', 0);
 
-			logger("Deleting orphaned data from notify-threads table. Last ID: ".$last_id);
-			$r = dba::p("SELECT `id` FROM `notify-threads`
+			Logger::log("Deleting orphaned data from notify-threads table. Last ID: ".$last_id);
+			$r = DBA::p("SELECT `id` FROM `notify-threads`
 					WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `notify-threads`.`master-parent-item`) AND `id` >= ?
-					ORDER BY `id` LIMIT ".intval($limit), $last_id);
-			$count = dba::num_rows($r);
+					ORDER BY `id` LIMIT ?", $last_id, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
-				logger("found notify-threads orphans: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				Logger::log("found notify-threads orphans: ".$count);
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('notify-threads', ['id' => $orphan["id"]]);
+					DBA::delete('notify-threads', ['id' => $orphan["id"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 5, $last_id);
 			} else {
-				logger("No notify-threads orphans found");
+				Logger::log("No notify-threads orphans found");
 			}
-			dba::close($r);
-			logger("Done deleting ".$count." orphaned data from notify-threads table. Last ID: ".$last_id);
+			DBA::close($r);
+			Logger::log("Done deleting ".$count." orphaned data from notify-threads table. Last ID: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-5', $last_id);
 
@@ -209,23 +208,23 @@ class DBClean {
 		} elseif ($stage == 6) {
 			$last_id = Config::get('system', 'dbclean-last-id-6', 0);
 
-			logger("Deleting orphaned data from sign table. Last ID: ".$last_id);
-			$r = dba::p("SELECT `iid`, `id` FROM `sign`
+			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 ".intval($limit), $last_id);
-			$count = dba::num_rows($r);
+					ORDER BY `id` LIMIT ?", $last_id, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
-				logger("found sign orphans: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				Logger::log("found sign orphans: ".$count);
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('sign', ['iid' => $orphan["iid"]]);
+					DBA::delete('sign', ['iid' => $orphan["iid"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 6, $last_id);
 			} else {
-				logger("No sign orphans found");
+				Logger::log("No sign orphans found");
 			}
-			dba::close($r);
-			logger("Done deleting ".$count." orphaned data from sign table. Last ID: ".$last_id);
+			DBA::close($r);
+			Logger::log("Done deleting ".$count." orphaned data from sign table. Last ID: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-6', $last_id);
 
@@ -235,23 +234,23 @@ class DBClean {
 		} elseif ($stage == 7) {
 			$last_id = Config::get('system', 'dbclean-last-id-7', 0);
 
-			logger("Deleting orphaned data from term table. Last ID: ".$last_id);
-			$r = dba::p("SELECT `oid`, `tid` FROM `term`
+			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 ".intval($limit), $last_id);
-			$count = dba::num_rows($r);
+					ORDER BY `tid` LIMIT ?", $last_id, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
-				logger("found term orphans: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				Logger::log("found term orphans: ".$count);
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["tid"];
-					dba::delete('term', ['oid' => $orphan["oid"]]);
+					DBA::delete('term', ['oid' => $orphan["oid"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 7, $last_id);
 			} else {
-				logger("No term orphans found");
+				Logger::log("No term orphans found");
 			}
-			dba::close($r);
-			logger("Done deleting ".$count." orphaned data from term table. Last ID: ".$last_id);
+			DBA::close($r);
+			Logger::log("Done deleting ".$count." orphaned data from term table. Last ID: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-7', $last_id);
 
@@ -265,8 +264,8 @@ class DBClean {
 
 			$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`
+			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`
@@ -277,20 +276,20 @@ class DBClean {
 	                                                                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);
+	                                ORDER BY `thread`.`iid` LIMIT ?", $days, $last_id, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
-				logger("found expired threads: ".$count);
-				while ($thread = dba::fetch($r)) {
+				Logger::log("found expired threads: ".$count);
+				while ($thread = DBA::fetch($r)) {
 					$last_id = $thread["iid"];
-					dba::delete('thread', ['iid' => $thread["iid"]]);
+					DBA::delete('thread', ['iid' => $thread["iid"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 8, $last_id);
 			} else {
-				logger("No expired threads found");
+				Logger::log("No expired threads found");
 			}
-			dba::close($r);
-			logger("Done deleting ".$count." expired threads. Last ID: ".$last_id);
+			DBA::close($r);
+			Logger::log("Done deleting ".$count." expired threads. Last ID: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-8', $last_id);
 		} elseif ($stage == 9) {
@@ -301,46 +300,47 @@ class DBClean {
 			$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
+			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
 						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);
+					ORDER BY `id` LIMIT ?", $last_id, $till_id, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
-				logger("found global item entries from expired threads: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				Logger::log("found global item entries from expired threads: ".$count);
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('item', ['id' => $orphan["id"]]);
+					DBA::delete('item', ['id' => $orphan["id"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 9, $last_id);
 			} else {
-				logger("No global item entries from expired threads");
+				Logger::log("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);
+			DBA::close($r);
+			Logger::log("Done deleting ".$count." old global item entries from expired threads. Last ID: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-9', $last_id);
 		} elseif ($stage == 10) {
 			$last_id = Config::get('system', 'dbclean-last-id-10', 0);
+			$days = intval(Config::get('system', 'dbclean_expire_conversation', 90));
 
-			logger("Deleting old conversations. Last created: ".$last_id);
-			$r = dba::p("SELECT `received`, `item-uri` FROM `conversation`
-					WHERE `received` < UTC_TIMESTAMP() - INTERVAL 90 DAY
-					ORDER BY `received` LIMIT ".intval($limit));
-			$count = dba::num_rows($r);
+			Logger::log("Deleting old conversations. Last created: ".$last_id);
+			$r = DBA::p("SELECT `received`, `item-uri` FROM `conversation`
+					WHERE `received` < UTC_TIMESTAMP() - INTERVAL ? DAY
+					ORDER BY `received` LIMIT ?", $days, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
-				logger("found old conversations: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				Logger::log("found old conversations: ".$count);
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["received"];
-					dba::delete('conversation', ['item-uri' => $orphan["item-uri"]]);
+					DBA::delete('conversation', ['item-uri' => $orphan["item-uri"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 10, $last_id);
 			} else {
-				logger("No old conversations found");
+				Logger::log("No old conversations found");
 			}
-			dba::close($r);
-			logger("Done deleting ".$count." conversations. Last created: ".$last_id);
+			DBA::close($r);
+			Logger::log("Done deleting ".$count." conversations. Last created: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-10', $last_id);
 		}