diff options
| -rw-r--r-- | lib/private/Files/Cache/Cache.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index 287966e4a28..e2630879414 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -1012,8 +1012,12 @@ class Cache implements ICache { * @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))) @@ -1021,15 +1025,15 @@ class Cache implements ICache { ->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; } /** |