perf(normalization): Optimize path normalization

Signed-off-by: Carl Schwan <[email protected]>

Author: CarlSchwan

lib/private/Files/Filesystem.php

@@ -7,10 +7,8 @@
  */
 namespace OC\Files;
 
-use OC\Files\Mount\MountPoint;
 use OC\Files\Storage\StorageFactory;
 use OC\User\NoUserException;
-use OCP\Cache\CappedMemoryCache;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Events\Node\FilesystemTornDownEvent;
 use OCP\Files\Mount\IMountManager;
@@ -28,8 +26,6 @@ class Filesystem {
 
 	private static ?View $defaultInstance = null;
 
-	private static ?CappedMemoryCache $normalizedPathCache = null;
-
 	private static ?FilenameValidator $validator = null;
 
 	/**
@@ -603,46 +599,61 @@ public static function normalizePath($path, $stripTrailingSlash = true, $isAbsol
 		 */
 		$path = (string)$path;
 
-		if ($path === '') {
+		if ($path === '' || $path === '/') {
 			return '/';
 		}
 
-		if (is_null(self::$normalizedPathCache)) {
-			self::$normalizedPathCache = new CappedMemoryCache(2048);
-		}
-
-		$cacheKey = json_encode([$path, $stripTrailingSlash, $isAbsolutePath, $keepUnicode]);
-
-		if ($cacheKey && isset(self::$normalizedPathCache[$cacheKey])) {
-			return self::$normalizedPathCache[$cacheKey];
-		}
-
 		//normalize unicode if possible
 		if (!$keepUnicode) {
 			$path = \OC_Util::normalizeUnicode($path);
 		}
 
-		//add leading slash, if it is already there we strip it anyway
-		$path = '/' . $path;
+		$len = strlen($path);
+		$out = [];
+		$outLen = 0;
+
+		// Force leading slash
+		$out[$outLen++] = '/';
+
+		$prev = '/';
+		$i = 0;
 
-		$patterns = [
-			'#\\\\#s',       // no windows style '\\' slashes
-			'#/\.(/\.)*/#s', // remove '/./'
-			'#\//+#s',       // remove sequence of slashes
-			'#/\.$#s',       // remove trailing '/.'
-		];
+		while ($i < $len) {
+			$c = $path[$i++];
 
-		do {
-			$count = 0;
-			$path = preg_replace($patterns, '/', $path, -1, $count);
-		} while ($count > 0);
+			// Normalize Windows slashes
+			if ($c === '\\') {
+				$c = '/';
+			}
+
+			// Collapse multiple slashes
+			if ($c === '/' && $prev === '/') {
+				continue;
+			}
+
+			// Handle "/./" and trailing "/."
+			if ($c === '.' && $prev === '/') {
+				$next = $i < $len ? $path[$i] : null;
+
+				if ($next === '/' || $next === null) {
+					// Skip "./"
+					if ($next === '/') {
+						$i++;
+					}
+					continue;
+				}
+			}
+
+			$out[$outLen++] = $c;
+			$prev = $c;
+		}
 
-		//remove trailing slash
-		if ($stripTrailingSlash && strlen($path) > 1) {
-			$path = rtrim($path, '/');
+		// Remove trailing slash
+		if ($stripTrailingSlash && $outLen > 1 && $out[$outLen - 1] === '/') {
+			array_pop($out);
 		}
 
-		self::$normalizedPathCache[$cacheKey] = $path;
+		$path = implode('', $out);
 
 		return $path;
 	}