Issue 11932: Restore SQL performance

[friendica.git] / src / Worker / RemoveUnusedContacts.php

diff --git a/src/Worker/RemoveUnusedContacts.php b/src/Worker/RemoveUnusedContacts.php
index b656eb82599ecfd824f22a8d2efa57c05f171f32..038376c22c925d199edca8d6d49ec13b905e63fe 100644 (file)
--- a/src/Worker/RemoveUnusedContacts.php
+++ b/src/Worker/RemoveUnusedContacts.php
@@ -21,6 +21,7 @@
 
 namespace Friendica\Worker;
 
+use Friendica\Contact\Avatar;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
@@ -39,7 +40,7 @@ class RemoveUnusedContacts
                $condition = ["`id` != ? AND `uid` = ? AND NOT `self` AND NOT `nurl` IN (SELECT `nurl` FROM `contact` WHERE `uid` != ?)
                        AND (NOT `network` IN (?, ?, ?, ?, ?, ?) OR (`archive` AND `success_update` < ?))
                        AND NOT `id` IN (SELECT `author-id` FROM `post-user`) AND NOT `id` IN (SELECT `owner-id` FROM `post-user`)
-                       AND NOT `id` IN (SELECT `causer-id` FROM `post-user`) AND NOT `id` IN (SELECT `cid` FROM `post-tag`)
+                       AND NOT `id` IN (SELECT `causer-id` FROM `post-user` WHERE `causer-id` IS NOT NULL) AND NOT `id` IN (SELECT `cid` FROM `post-tag`)
                        AND NOT `id` IN (SELECT `contact-id` FROM `post-user`) AND NOT `id` IN (SELECT `cid` FROM `user-contact`)
                        AND NOT `id` IN (SELECT `cid` FROM `event`) AND NOT `id` IN (SELECT `contact-id` FROM `group_member`)
                        AND `created` < ?",
@@ -51,9 +52,7 @@ class RemoveUnusedContacts
                $contacts = DBA::select('contact', ['id', 'uid', 'photo', 'thumb', 'micro'], $condition);
                while ($contact = DBA::fetch($contacts)) {
                        Photo::delete(['uid' => $contact['uid'], 'contact-id' => $contact['id']]);
-                       Contact::deleteAvatarCache($contact['photo']);
-                       Contact::deleteAvatarCache($contact['thumb']);
-                       Contact::deleteAvatarCache($contact['micro']);
+                       Avatar::deleteCache($contact);
 
                        if (DBStructure::existsTable('thread')) {
                                DBA::delete('thread', ['owner-id' => $contact['id']]);
@@ -79,9 +78,9 @@ class RemoveUnusedContacts
                        DBA::delete('post-thread-user', ['author-id' => $contact['id']]);
                        DBA::delete('post-thread-user', ['causer-id' => $contact['id']]);
 
-                       DBA::delete('contact', ['id' => $contact['id']]);
+                       Contact::deleteById($contact['id']);
                        if ((++$count % 1000) == 0) {
-                               Logger::notice('In removal', ['count' => $count, 'total' => $total]);
+                               Logger::info('In removal', ['count' => $count, 'total' => $total]);
                        }
                }
                DBA::close($contacts);