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

Move normalizePath to regexes instead of looping 

This is IMO a bit more readable and it seems to make the code faster.
Tested it on the company instance where there are over 3k calls to this
function. It shaves off around 10ms.

The advantage here is that the pattern gets optimized by php itsel and
cached.
Also looking for all patterns at the same time and especially no longer
looping for /./ patterns should save time.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-10-08 22:51:40 +02:00
parent 1dbd7172c3
commit d5bf2c4523
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 80 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/private/Files/Filesystem.php
View File

@ -812,7 +812,7 @@ class Filesystem {
return self::$normalizedPathCache[$cacheKey];
}
if ($path == '') {
if ($path === '') {
return '/';
}
@ -821,38 +821,29 @@ class Filesystem {
$path = \OC_Util::normalizeUnicode($path);
}
//no windows style slashes
$path = str_replace('\\', '/', $path);
//add leading slash, if it is already there we strip it anyway
$path = '/' . $path;
//add leading slash
if ($path[0] !== '/') {
$path = '/' . $path;
}
$patterns = [
'/\\\\/s', // no windows style slashes
'/\/\.(\/\.)?\//s', // remove '/./'
'/\/{2,}/s', // remove squence of slashes
'/\/\.$/s', // remove trailing /.
];
// remove '/./'
// ugly, but str_replace() can't replace them all in one go
// as the replacement itself is part of the search string
// which will only be found during the next iteration
while (strpos($path, '/./') !== false) {
$path = str_replace('/./', '/', $path);
}
// remove sequences of slashes
$path = preg_replace('#/{2,}#', '/', $path);
do {
$count = 0;
$path = preg_replace($patterns, '/', $path, -1, $count);
} while ($count > 0);
//remove trailing slash
if ($stripTrailingSlash and strlen($path) > 1) {
if ($stripTrailingSlash && strlen($path) > 1) {
$path = rtrim($path, '/');
}
// remove trailing '/.'
if (substr($path, -2) == '/.') {
$path = substr($path, 0, -2);
}
self::$normalizedPathCache[$cacheKey] = $path;
$normalizedPath = $path;
self::$normalizedPathCache[$cacheKey] = $normalizedPath;
return $normalizedPath;
return $path;
}
/**

121
tests/lib/Files/FilesystemTest.php
View File

@ -115,73 +115,80 @@ class FilesystemTest extends \Test\TestCase {
}
public function normalizePathData() {
return array(
array('/', ''),
array('/', '/'),
array('/', '//'),
array('/', '/', false),
array('/', '//', false),
return [
['/', ''],
['/', '/'],
['/', '//'],
['/', '/', false],
['/', '//', false],
array('/path', '/path/'),
array('/path/', '/path/', false),
array('/path', 'path'),
['/path', '/path/'],
['/path/', '/path/', false],
['/path', 'path'],
array('/foo/bar', '/foo//bar/'),
array('/foo/bar/', '/foo//bar/', false),
array('/foo/bar', '/foo////bar'),
array('/foo/bar', '/foo/////bar'),
array('/foo/bar', '/foo/bar/.'),
array('/foo/bar', '/foo/bar/./'),
array('/foo/bar/', '/foo/bar/./', false),
array('/foo/bar', '/foo/bar/./.'),
array('/foo/bar', '/foo/bar/././'),
array('/foo/bar/', '/foo/bar/././', false),
array('/foo/bar', '/foo/./bar/'),
array('/foo/bar/', '/foo/./bar/', false),
array('/foo/.bar', '/foo/.bar/'),
array('/foo/.bar/', '/foo/.bar/', false),
array('/foo/.bar/tee', '/foo/.bar/tee'),
['/foo/bar', '/foo//bar/'],
['/foo/bar/', '/foo//bar/', false],
['/foo/bar', '/foo////bar'],
['/foo/bar', '/foo/////bar'],
['/foo/bar', '/foo/bar/.'],
['/foo/bar', '/foo/bar/./'],
['/foo/bar/', '/foo/bar/./', false],
['/foo/bar', '/foo/bar/./.'],
['/foo/bar', '/foo/bar/././'],
['/foo/bar/', '/foo/bar/././', false],
['/foo/bar', '/foo/./bar/'],
['/foo/bar/', '/foo/./bar/', false],
['/foo/.bar', '/foo/.bar/'],
['/foo/.bar/', '/foo/.bar/', false],
['/foo/.bar/tee', '/foo/.bar/tee'],
['/foo/bar', '/.///././//./foo/.///././//./bar/./././.'],
['/foo/bar/', '/.///././//./foo/.///././//./bar/./././.', false],
['/foo/bar', '/.///././//./foo/.///././//./bar/././././'],
['/foo/bar/', '/.///././//./foo/.///././//./bar/././././', false],
// Windows paths
array('/', ''),
array('/', '\\'),
array('/', '\\', false),
array('/', '\\\\'),
array('/', '\\\\', false),
['/', ''],
['/', '\\'],
['/', '\\', false],
['/', '\\\\'],
['/', '\\\\', false],
array('/path', '\\path'),
array('/path', '\\path', false),
array('/path', '\\path\\'),
array('/path/', '\\path\\', false),
['/path', '\\path'],
['/path', '\\path', false],
['/path', '\\path\\'],
['/path/', '\\path\\', false],
array('/foo/bar', '\\foo\\\\bar\\'),
array('/foo/bar/', '\\foo\\\\bar\\', false),
array('/foo/bar', '\\foo\\\\\\\\bar'),
array('/foo/bar', '\\foo\\\\\\\\\\bar'),
array('/foo/bar', '\\foo\\bar\\.'),
array('/foo/bar', '\\foo\\bar\\.\\'),
array('/foo/bar/', '\\foo\\bar\\.\\', false),
array('/foo/bar', '\\foo\\bar\\.\\.'),
array('/foo/bar', '\\foo\\bar\\.\\.\\'),
array('/foo/bar/', '\\foo\\bar\\.\\.\\', false),
array('/foo/bar', '\\foo\\.\\bar\\'),
array('/foo/bar/', '\\foo\\.\\bar\\', false),
array('/foo/.bar', '\\foo\\.bar\\'),
array('/foo/.bar/', '\\foo\\.bar\\', false),
array('/foo/.bar/tee', '\\foo\\.bar\\tee'),
['/foo/bar', '\\foo\\\\bar\\'],
['/foo/bar/', '\\foo\\\\bar\\', false],
['/foo/bar', '\\foo\\\\\\\\bar'],
['/foo/bar', '\\foo\\\\\\\\\\bar'],
['/foo/bar', '\\foo\\bar\\.'],
['/foo/bar', '\\foo\\bar\\.\\'],
['/foo/bar/', '\\foo\\bar\\.\\', false],
['/foo/bar', '\\foo\\bar\\.\\.'],
['/foo/bar', '\\foo\\bar\\.\\.\\'],
['/foo/bar/', '\\foo\\bar\\.\\.\\', false],
['/foo/bar', '\\foo\\.\\bar\\'],
['/foo/bar/', '\\foo\\.\\bar\\', false],
['/foo/.bar', '\\foo\\.bar\\'],
['/foo/.bar/', '\\foo\\.bar\\', false],
['/foo/.bar/tee', '\\foo\\.bar\\tee'],
// Absolute windows paths NOT marked as absolute
array('/C:', 'C:\\'),
array('/C:/', 'C:\\', false),
array('/C:/tests', 'C:\\tests'),
array('/C:/tests', 'C:\\tests', false),
array('/C:/tests', 'C:\\tests\\'),
array('/C:/tests/', 'C:\\tests\\', false),
['/C:', 'C:\\'],
['/C:/', 'C:\\', false],
['/C:/tests', 'C:\\tests'],
['/C:/tests', 'C:\\tests', false],
['/C:/tests', 'C:\\tests\\'],
['/C:/tests/', 'C:\\tests\\', false],
['/C:/tests/bar', 'C:\\tests\\.\\.\\bar'],
['/C:/tests/bar/', 'C:\\tests\\.\\.\\bar\\.\\', false],
// normalize does not resolve '..' (by design)
array('/foo/..', '/foo/../'),
array('/foo/..', '\\foo\\..\\'),
);
['/foo/..', '/foo/../'],
['/foo/..', '\\foo\\..\\'],
];
}
/**