perf(files): Optimize CacheEntry creatoin

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

Author: CarlSchwan

lib/private/Files/Cache/Cache.php

@@ -148,41 +148,38 @@ public function get($file) {
 
 	/**
 	 * Create a CacheEntry from database row
-	 *
-	 * @param array $data
-	 * @param IMimeTypeLoader $mimetypeLoader
-	 * @return CacheEntry
 	 */
-	public static function cacheEntryFromData($data, IMimeTypeLoader $mimetypeLoader) {
-		//fix types
-		$data['name'] = (string)$data['name'];
-		$data['path'] = (string)$data['path'];
-		$data['fileid'] = (int)$data['fileid'];
-		$data['parent'] = (int)$data['parent'];
-		$data['size'] = Util::numericToNumber($data['size']);
-		$data['unencrypted_size'] = Util::numericToNumber($data['unencrypted_size'] ?? 0);
-		$data['mtime'] = (int)$data['mtime'];
-		$data['storage_mtime'] = (int)$data['storage_mtime'];
-		$data['encryptedVersion'] = (int)$data['encrypted'];
-		$data['encrypted'] = (bool)$data['encrypted'];
-		$data['storage_id'] = $data['storage'];
-		$data['storage'] = (int)$data['storage'];
-		$data['mimetype'] = $mimetypeLoader->getMimetypeById($data['mimetype']);
-		$data['mimepart'] = $mimetypeLoader->getMimetypeById($data['mimepart']);
-		if ($data['storage_mtime'] == 0) {
-			$data['storage_mtime'] = $data['mtime'];
-		}
+	public static function cacheEntryFromData(array $data, IMimeTypeLoader $mimetypeLoader): CacheEntry {
+		$normalized = [
+			'name' => (string)$data['name'],
+			'etag' => (string)$data['etag'],
+			'path' => (string)$data['path'],
+			'fileid' => (int)$data['fileid'],
+			'parent' => (int)$data['parent'],
+			'size' => Util::numericToNumber($data['size']),
+			'unencrypted_size' => Util::numericToNumber($data['unencrypted_size'] ?? 0),
+			'mtime' => (int)$data['mtime'],
+			'storage_mtime' => (int)($data['storage_mtime'] ?: $data['mtime']),
+			'encryptedVersion' => (int)$data['encrypted'],
+			'encrypted' => (bool)$data['encrypted'],
+			'storage_id' => $data['storage'],
+			'storage' => (int)$data['storage'],
+			'mimetype' => $mimetypeLoader->getMimetypeById($data['mimetype']),
+			'mimepart' => $mimetypeLoader->getMimetypeById($data['mimepart']),
+			'permissions' => (int)$data['permissions'],
+		];
+
 		if (isset($data['f_permissions'])) {
-			$data['scan_permissions'] ??= $data['f_permissions'];
+			$normalized['scan_permissions'] = $data['scan_permissions'] ?? $data['f_permissions'];
 		}
-		$data['permissions'] = (int)$data['permissions'];
+
 		if (isset($data['creation_time'])) {
-			$data['creation_time'] = (int)$data['creation_time'];
+			$normalized['creation_time'] = (int)$data['creation_time'];
+			$normalized['upload_time'] = (int)$data['upload_time'];
+			$normalized['metadata_etag'] = (string)$data['metadata_etag'];
 		}
-		if (isset($data['upload_time'])) {
-			$data['upload_time'] = (int)$data['upload_time'];
-		}
-		return new CacheEntry($data);
+
+		return new CacheEntry($normalized);
 	}
 
 	/**

lib/private/Files/Cache/CacheEntry.php

@@ -13,13 +13,9 @@
  * meta data for a file or folder
  */
 class CacheEntry implements ICacheEntry {
-	/**
-	 * @var array
-	 */
-	private $data;
-
-	public function __construct(array $data) {
-		$this->data = $data;
+	public function __construct(
+		private array $data,
+	) {
 	}
 
 	public function offsetSet($offset, $value): void {