X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdbclean.php;h=64185b39d9ccdf6fa71740a2ae82dd858f98790f;hb=377fe3190744c644f61a4dc125314e3d6b4bac68;hp=64ceb51d37bc58060c29f53b06ad1b9457e86345;hpb=82f13441bc5aa0e74fcbef6fcda704c0464a5287;p=friendica.git

diff --git a/include/dbclean.php b/include/dbclean.php
index 64ceb51d37..64185b39d9 100644
--- a/include/dbclean.php
+++ b/include/dbclean.php
@@ -4,7 +4,7 @@
  * @brief The script is called from time to time to clean the database entries and remove orphaned data.
  */
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
 function dbclean_run(&$argv, &$argc) {
 	if (!Config::get('system', 'dbclean', false)) {
@@ -18,13 +18,11 @@ function dbclean_run(&$argv, &$argc) {
 	}
 
 	if ($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);
-		proc_run(PRIORITY_LOW, 'include/dbclean.php', 4);
-		proc_run(PRIORITY_LOW, 'include/dbclean.php', 5);
-		proc_run(PRIORITY_LOW, 'include/dbclean.php', 6);
-		proc_run(PRIORITY_LOW, 'include/dbclean.php', 7);
+		for ($i = 1; $i <= 7; $i++) {
+			if (!Config::get('system', 'finished-dbclean-'.$i)) {
+				proc_run(PRIORITY_LOW, 'include/dbclean.php', $i);
+			}
+		}
 	} else {
 		remove_orphans($stage);
 	}
@@ -41,7 +39,7 @@ function remove_orphans($stage = 0) {
 	// We split the deletion in many small tasks
 	$limit = 1000;
 
-	if (($stage == 1) OR ($stage == 0)) {
+	if ($stage == 1) {
 		logger("Deleting old global item entries from item table without user copy");
 		$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)
@@ -50,97 +48,107 @@ function remove_orphans($stage = 0) {
 		if ($count > 0) {
 			logger("found global item orphans: ".$count);
 			while ($orphan = dba::fetch($r)) {
-				q("DELETE FROM `item` WHERE `id` = %d", intval($orphan["id"]));
+				dba::delete('item', array('id' => $orphan["id"]));
 			}
+		} else {
+			logger("No global item orphans found");
+
+			// We will eventually set this value when we found a good way to delete these items in another way.
+			// Config::set('system', 'finished-dbclean-1', true);
 		}
 		dba::close($r);
-		logger("Done deleting old global item entries from item table without user copy");
-	}
-
-	if (($stage == 2) OR ($stage == 0)) {
+		logger("Done deleting ".$count." old global item entries from item table without user copy");
+	} elseif ($stage == 2) {
 		logger("Deleting items without parents");
 		$r = dba::p("SELECT `id` FROM `item` WHERE NOT EXISTS (SELECT `id` FROM `item` AS `i` WHERE `item`.`parent` = `i`.`id`) LIMIT ".intval($limit));
 		$count = dba::num_rows($r);
 		if ($count > 0) {
 			logger("found item orphans without parents: ".$count);
 			while ($orphan = dba::fetch($r)) {
-				q("DELETE FROM `item` WHERE `id` = %d", intval($orphan["id"]));
+				dba::delete('item', array('id' => $orphan["id"]));
 			}
+		} else {
+			logger("No item orphans without parents found");
+			Config::set('system', 'finished-dbclean-2', true);
 		}
 		dba::close($r);
-		logger("Done deleting items without parents");
-	}
-
-	if (($stage == 3) OR ($stage == 0)) {
+		logger("Done deleting ".$count." items without parents");
+	} elseif ($stage == 3) {
 		logger("Deleting orphaned data from thread table");
 		$r = dba::p("SELECT `iid` FROM `thread` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `thread`.`iid`) LIMIT ".intval($limit));
 		$count = dba::num_rows($r);
 		if ($count > 0) {
 			logger("found thread orphans: ".$count);
 			while ($orphan = dba::fetch($r)) {
-				q("DELETE FROM `thread` WHERE `iid` = %d", intval($orphan["iid"]));
+				dba::delete('thread', array('iid' => $orphan["iid"]));
 			}
+		} else {
+			logger("No thread orphans found");
+			Config::set('system', 'finished-dbclean-3', true);
 		}
-		dba::close($r);
-		logger("Done deleting orphaned data from thread table");
-	}
 
-	if (($stage == 4) OR ($stage == 0)) {
+		dba::close($r);
+		logger("Done deleting ".$count." orphaned data from thread table");
+	} elseif ($stage == 4) {
 		logger("Deleting orphaned data from notify table");
 		$r = dba::p("SELECT `iid` FROM `notify` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `notify`.`iid`) LIMIT ".intval($limit));
 		$count = dba::num_rows($r);
 		if ($count > 0) {
 			logger("found notify orphans: ".$count);
 			while ($orphan = dba::fetch($r)) {
-				q("DELETE FROM `notify` WHERE `iid` = %d", intval($orphan["iid"]));
+				dba::delete('notify', array('iid' => $orphan["iid"]));
 			}
+		} else {
+			logger("No notify orphans found");
+			Config::set('system', 'finished-dbclean-4', true);
 		}
 		dba::close($r);
-		logger("Done deleting orphaned data from notify table");
-	}
-
-	if (($stage == 5) OR ($stage == 0)) {
+		logger("Done deleting ".$count." orphaned data from notify table");
+	} elseif ($stage == 5) {
 		logger("Deleting orphaned data from notify-threads table");
 		$r = dba::p("SELECT `id` FROM `notify-threads` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `notify-threads`.`master-parent-item`) LIMIT ".intval($limit));
 		$count = dba::num_rows($r);
 		if ($count > 0) {
 			logger("found notify-threads orphans: ".$count);
 			while ($orphan = dba::fetch($r)) {
-				q("DELETE FROM `notify-threads` WHERE `id` = %d", intval($orphan["id"]));
+				dba::delete('notify-threads', array('id' => $orphan["id"]));
 			}
+		} else {
+			logger("No notify-threads orphans found");
+			Config::set('system', 'finished-dbclean-5', true);
 		}
 		dba::close($r);
-		logger("Done deleting orphaned data from notify-threads table");
-	}
-
-
-	if (($stage == 6) OR ($stage == 0)) {
+		logger("Done deleting ".$count." orphaned data from notify-threads table");
+	} elseif ($stage == 6) {
 		logger("Deleting orphaned data from sign table");
 		$r = dba::p("SELECT `iid` FROM `sign` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `sign`.`iid`) LIMIT ".intval($limit));
 		$count = dba::num_rows($r);
 		if ($count > 0) {
 			logger("found sign orphans: ".$count);
 			while ($orphan = dba::fetch($r)) {
-				q("DELETE FROM `sign` WHERE `iid` = %d", intval($orphan["iid"]));
+				dba::delete('sign', array('iid' => $orphan["iid"]));
 			}
+		} else {
+			logger("No sign orphans found");
+			Config::set('system', 'finished-dbclean-6', true);
 		}
 		dba::close($r);
-		logger("Done deleting orphaned data from sign table");
-	}
-
-
-	if (($stage == 7) OR ($stage == 0)) {
+		logger("Done deleting ".$count." orphaned data from sign table");
+	} elseif ($stage == 7) {
 		logger("Deleting orphaned data from term table");
 		$r = dba::p("SELECT `oid` FROM `term` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `term`.`oid`) LIMIT ".intval($limit));
 		$count = dba::num_rows($r);
 		if ($count > 0) {
 			logger("found term orphans: ".$count);
 			while ($orphan = dba::fetch($r)) {
-				q("DELETE FROM `term` WHERE `oid` = %d", intval($orphan["oid"]));
+				dba::delete('term', array('oid' => $orphan["oid"]));
 			}
+		} else {
+			logger("No term orphans found");
+			Config::set('system', 'finished-dbclean-7', true);
 		}
 		dba::close($r);
-		logger("Done deleting orphaned data from term table");
+		logger("Done deleting ".$count." orphaned data from term table");
 	}
 
 	// Call it again if not all entries were purged
@@ -149,4 +157,3 @@ function remove_orphans($stage = 0) {
 	}
 
 }
-?>