Merge pull request #6988 from starypatyk/stable12-mount-cache-performance

MorrisJobke · web-flow · commit 19069f2b9c0a · 2017-11-07T17:32:06.000+01:00
Improve performance of UserMountCache with external storage folders
diff --git a/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php
@@ -195,7 +195,11 @@ private function dbRowToMountInfo(array $row) {
 		if (is_null($user)) {
 			return null;
 		}
-		return new CachedMountInfo($user, (int)$row['storage_id'], (int)$row['root_id'], $row['mount_point'], $row['mount_id'], isset($row['path']) ? $row['path'] : '');
+		$mount_id = $row['mount_id'];
+		if (!is_null($mount_id)) {
+			$mount_id = (int) $mount_id;
+		}
+		return new CachedMountInfo($user, (int)$row['storage_id'], (int)$row['root_id'], $row['mount_point'], $mount_id, isset($row['path']) ? $row['path'] : '');
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,11 @@ private function dbRowToMountInfo(array $row) {`
`195`	`195`	`if (is_null($user)) {`
`196`	`196`	`return null;`
`197`	`197`	`}`
`198`		`- return new CachedMountInfo($user, (int)$row['storage_id'], (int)$row['root_id'], $row['mount_point'], $row['mount_id'], isset($row['path']) ? $row['path'] : '');`
	`198`	`+ $mount_id = $row['mount_id'];`
	`199`	`+ if (!is_null($mount_id)) {`
	`200`	`+ $mount_id = (int) $mount_id;`
	`201`	`+ }`
	`202`	`+ return new CachedMountInfo($user, (int)$row['storage_id'], (int)$row['root_id'], $row['mount_point'], $mount_id, isset($row['path']) ? $row['path'] : '');`
`199`	`203`	`}`
`200`	`204`
`201`	`205`	`/**`