From e5dd24e01f8d90ddc194934934fa150807fd0a40 Mon Sep 17 00:00:00 2001
From: JediKev <kevin@enhancesoft.com>
Date: Thu, 12 Jul 2018 17:15:50 -0500
Subject: [PATCH] issue: Orphaned File Query Rewrite
This addresses an issue that was introduced by a previous attempt to
address the orphaned file query. The previous attempt addressed the
original issue but slowed database performance so this addresses the
performance issue.
---
include/class.file.php | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/include/class.file.php b/include/class.file.php
index 2a0073b4b..e8ea7db9a 100644
--- a/include/class.file.php
+++ b/include/class.file.php
@@ -627,20 +627,17 @@ class AttachmentFile extends VerySimpleModel {
* canned-response, or faq point to any more.
*/
static function deleteOrphans() {
-
- // XXX: Allow plugins to define filetypes which do not represent
- // files attached to tickets or other things in the attachment
- // table and are not logos
- $files = static::objects()
- ->filter(array(
- 'attachments__object_id__isnull' => true,
- 'ft' => 'T',
- 'created__lt' => SqlFunction::NOW()->minus(SqlInterval::DAY(1)),
- ));
-
- foreach ($files as $f) {
- if (!$f->delete())
- break;
+ $sql = "SELECT `id` FROM ".FILE_TABLE.
+ " A1 WHERE (A1.ft = 'T' AND A1.created < NOW() - INTERVAL 1 DAY)".
+ " AND NOT EXISTS (SELECT id FROM ".ATTACHMENT_TABLE.
+ " A2 WHERE A1.`id` = A2.`file_id`)";
+
+ if (($res=db_query($sql)) && db_num_rows($res)) {
+ while (list($id) = db_fetch_row($res)) {
+ if ($f = static::lookup((int) $id))
+ if (!$f->delete())
+ break;
+ }
}
return true;
--
GitLab