From a5cd892caa42f66cfaea0089b6b7bc0e04327a3a Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 8 Jun 2023 17:14:18 +0200 Subject: [PATCH] select the fileid first when looking for incomplete files this seems to improve mariadbs index selection Signed-off-by: Robin Appelman --- lib/private/Files/Cache/Cache.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index 1adc14c626cf9..76b2fa942cc8a 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -1025,8 +1025,12 @@ public function getAll() { * @return string|false the path of the folder or false when no folder matched */ public function getIncomplete() { + // we select the fileid here first instead of directly selecting the path since this helps mariadb/mysql + // to use the correct index. + // The overhead of this should be minimal since the cost of selecting the path by id should be much lower + // than the cost of finding an item with size < 0 $query = $this->getQueryBuilder(); - $query->select('path') + $query->select('fileid') ->from('filecache') ->whereStorageId($this->getNumericStorageId()) ->andWhere($query->expr()->lt('size', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))) @@ -1034,15 +1038,15 @@ public function getIncomplete() { ->setMaxResults(1); $result = $query->execute(); - $path = $result->fetchOne(); + $id = $result->fetchOne(); $result->closeCursor(); - if ($path === false) { + if ($id === false) { return false; } - // Make sure Oracle does not continue with null for empty strings - return (string)$path; + $path = $this->getPathById($id); + return $path ?? false; } /**