From 2db7a4971c4af77de8ae6634455909a515dd60f8 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 15 Oct 2020 09:42:18 +0000 Subject: [PATCH] Count removed, added logging for iten uri --- src/Worker/CleanItemUri.php | 4 +++- src/Worker/ExpirePosts.php | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Worker/CleanItemUri.php b/src/Worker/CleanItemUri.php index 60a983506..0f24e549f 100644 --- a/src/Worker/CleanItemUri.php +++ b/src/Worker/CleanItemUri.php @@ -21,6 +21,7 @@ namespace Friendica\Worker; +use Friendica\Core\Logger; use Friendica\Database\DBA; class CleanItemUri @@ -30,8 +31,9 @@ class CleanItemUri */ public static function execute() { - DBA::p("DELETE FROM `item-uri` WHERE NOT `id` IN (SELECT `uri-id` FROM `item`) + $ret = DBA::e("DELETE FROM `item-uri` WHERE NOT `id` IN (SELECT `uri-id` FROM `item`) AND NOT `id` IN (SELECT `parent-uri-id` FROM `item`) AND NOT `id` IN (SELECT `thr-parent-id` FROM `item`)"); + Logger::notice('Orphaned URI-ID entries removed', ['result' => $ret, 'rows' => DBA::affectedRows()]); } } diff --git a/src/Worker/ExpirePosts.php b/src/Worker/ExpirePosts.php index 22136467b..f8d243267 100644 --- a/src/Worker/ExpirePosts.php +++ b/src/Worker/ExpirePosts.php @@ -40,7 +40,7 @@ class ExpirePosts } if (!empty($expire_days)) { - Logger::notice('Start deleting expired threads', ['expiry_days' => $expire_days, 'count' => DBA::count('item')]); + Logger::notice('Start deleting expired threads', ['expiry_days' => $expire_days]); $ret = DBA::e("DELETE FROM `item-uri` WHERE `id` IN (SELECT `uri-id` FROM `thread` INNER JOIN `contact` ON `id` = `contact-id` AND NOT `notify_new_posts` @@ -54,20 +54,20 @@ class ExpirePosts WHERE `uri-id` = `item`.`uri-id`)) AND `item`.`parent` = `thread`.`iid`))", $expire_days); - Logger::notice('Deleted expired threads', ['result' => $ret, 'rows' => DBA::affectedRows(), 'count' => DBA::count('item')]); + Logger::notice('Deleted expired threads', ['result' => $ret, 'rows' => DBA::affectedRows()]); } if (!empty($expire_days_unclaimed)) { $expiry_date = DateTimeFormat::utc('now - ' . $expire_days_unclaimed . ' days', DateTimeFormat::MYSQL); - Logger::notice('Start deleting unclaimed public items', ['expiry_days' => $expire_days_unclaimed, 'expired' => $expiry_date, 'count' => DBA::count('item')]); + Logger::notice('Start deleting unclaimed public items', ['expiry_days' => $expire_days_unclaimed, 'expired' => $expiry_date]); $ret = DBA::e("DELETE FROM `item-uri` WHERE `id` IN (SELECT `uri-id` FROM `item` WHERE `gravity` = ? AND `uid` = ? AND `received` < ? AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `item` WHERE `uid` != ?) AND NOT `uri-id` IN (SELECT `parent-uri-id` FROM `item` WHERE `uid` = ? AND `received` > ?))", GRAVITY_PARENT, 0, $expiry_date, 0, 0, $expiry_date); - Logger::notice('Deleted unclaimed public items', ['result' => $ret, 'rows' => DBA::affectedRows(), 'count' => DBA::count('item')]); + Logger::notice('Deleted unclaimed public items', ['result' => $ret, 'rows' => DBA::affectedRows()]); } } }