From: Michael <heluecht@pirati.ca>
Date: Sat, 7 Jul 2018 07:43:13 +0000 (+0000)
Subject: Removing of orphaned activity and content data
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b421e7708ff31d2bb4e367974798aa11a56bfd79;p=friendica.git

Removing of orphaned activity and content data
---

diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index 5d56308faf..b09db5c677 100644
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -39,12 +39,24 @@ class Expire {
 			}
 			dba::close($rows);
 
-			logger('Delete expired items - done', LOGGER_DEBUG);
+			// Normally we shouldn't have orphaned data at all.
+			// If we do have some, then we have to check why.
+			logger('Deleting orphaned item activities - start', LOGGER_DEBUG);
+			$condition = ["NOT EXISTS (SELECT `iaid` FROM `item` WHERE `item`.`uri` = `item-activity`.`uri`)"];
+			dba::delete('item-activity', $condition);
+			logger('Orphaned item activities deleted: ' . dba::affected_rows(), LOGGER_DEBUG);
+
+			logger('Deleting orphaned item content - start', LOGGER_DEBUG);
+			$condition = ["NOT EXISTS (SELECT `icid` FROM `item` WHERE `item`.`uri` = `item-content`.`uri`)"];
+			dba::delete('item-content', $condition);
+			logger('Orphaned item content deleted: ' . dba::affected_rows(), LOGGER_DEBUG);
 
 			// make this optional as it could have a performance impact on large sites
 			if (intval(Config::get('system', 'optimize_items'))) {
 				dba::e("OPTIMIZE TABLE `item`");
 			}
+
+			logger('Delete expired items - done', LOGGER_DEBUG);
 			return;
 		} elseif (intval($param) > 0) {
 			$user = dba::selectFirst('user', ['uid', 'username', 'expire'], ['uid' => $param]);