mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cache results of `normalizePath` 

`normalizePath` is a rather expensive operation and called multiple times for a single path for every file related operation.

In my development installation with about 9GB of data and 60k files this leads to a performance boost of 24% - in seconds that are 1.86s (!) - for simple searches. With more files the impact will be even more noticeable. Obviously this affects every operation that has in any regard something to do with using OC\Files\Filesystem.

Part of https://github.com/owncloud/core/issues/13221
This commit is contained in:
Lukas Reschke 2015-01-10 10:48:28 +01:00
parent ae3483299c
commit 7e11ca06f6
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/private/files/filesystem.php
View File

@ -47,6 +47,8 @@ class Filesystem {
static private $usersSetup = array();
static private $normalizedPathCache = array();
/**
* classname which used for hooks handling
* used as signalclass in OC_Hooks::emit()
@ -713,6 +715,12 @@ class Filesystem {
* @return string
*/
public static function normalizePath($path, $stripTrailingSlash = true, $isAbsolutePath = false) {
$cacheKey = $path.'-'.-$stripTrailingSlash.'-'.$isAbsolutePath;
if(isset(self::$normalizedPathCache[$cacheKey])) {
return self::$normalizedPathCache[$cacheKey];
}
if ($path == '') {
return '/';
}
@ -756,7 +764,10 @@ class Filesystem {
//normalize unicode if possible
$path = \OC_Util::normalizeUnicode($path);
return $windows_drive_letter . $path;
$normalizedPath = $windows_drive_letter . $path;
self::$normalizedPathCache[$cacheKey] = $normalizedPath;
return $normalizedPath;
}
/**