Skip to content

perf(files): Optimize CacheEntry creation #57514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CarlSchwan wants to merge 2 commits into
base: master
Choose a base branch
from
+60 −53
Open

perf(files): Optimize CacheEntry creation #57514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7d2a16
perf(files): Optimize CacheEntry creatoin
CarlSchwan Jan 13, 2026
a8b8719
fix(cache): Handle groupfolder specific entries in cacheEntryFromData
CarlSchwan Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions apps/files_sharing/tests/CacheTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@

use OC\Files\Cache\Cache;
use OC\Files\Filesystem;
use OC\Files\SetupManager;
use OC\Files\Storage\Storage;
use OC\Files\Storage\Temporary;
use OC\Files\Storage\Wrapper\Jail;
use OC\Files\View;
use OCA\Files_Sharing\SharedStorage;
use OCP\Constants;
use OCP\Files\Cache\IWatcher;
use OCP\Files\IRootFolder;
use OCP\IUserManager;
use OCP\Server;
use OCP\Share\IShare;
Expand Down Expand Up @@ -424,8 +426,7 @@ public function testGetPathByIdDirectShare(): void {
$share = $this->shareManager->createShare($share);
$share->setStatus(IShare::STATUS_ACCEPTED);
$this->shareManager->updateShare($share);

\OC_Util::tearDownFS();
Server::get(SetupManager::class)->tearDown();

self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
$this->assertTrue(Filesystem::file_exists('/test.txt'));
Expand Down Expand Up @@ -456,7 +457,7 @@ public function testGetPathByIdShareSubFolder(): void {
$share = $this->shareManager->createShare($share);
$share->setStatus(IShare::STATUS_ACCEPTED);
$this->shareManager->updateShare($share);
\OC_Util::tearDownFS();
Server::get(SetupManager::class)->tearDown();

self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
$this->assertTrue(Filesystem::file_exists('/foo'));
Expand Down Expand Up @@ -484,7 +485,7 @@ public function testNumericStorageId(): void {
$share = $this->shareManager->createShare($share);
$share->setStatus(IShare::STATUS_ACCEPTED);
$this->shareManager->updateShare($share);
\OC_Util::tearDownFS();
Server::get(SetupManager::class)->tearDown();

[$sourceStorage] = Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER1 . '/files/foo');

Expand Down Expand Up @@ -521,7 +522,7 @@ public function testShareJailedStorage(): void {
$share = $this->shareManager->createShare($share);
$share->setStatus(IShare::STATUS_ACCEPTED);
$this->shareManager->updateShare($share);
\OC_Util::tearDownFS();
Server::get(SetupManager::class)->tearDown();

self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
$this->assertEquals('foo', Filesystem::file_get_contents('/sub/foo.txt'));
Expand Down Expand Up @@ -560,7 +561,7 @@ public function testSearchShareJailedStorage(): void {
$share = $this->shareManager->createShare($share);
$share->setStatus(IShare::STATUS_ACCEPTED);
$this->shareManager->updateShare($share);
\OC_Util::tearDownFS();
Server::get(SetupManager::class)->tearDown();

self::loginHelper(self::TEST_FILES_SHARING_API_USER2);

Expand All @@ -571,7 +572,7 @@ public function testSearchShareJailedStorage(): void {
$this->assertCount(1, $results);
}

public function testWatcherRootChange() {
public function testWatcherRootChange(): void {
$sourceStorage = new Temporary();
$sourceStorage->mkdir('shared');
$sourceStorage->file_put_contents('shared/foo.txt', 'foo');
Expand All @@ -581,7 +582,8 @@ public function testWatcherRootChange() {

self::loginHelper(self::TEST_FILES_SHARING_API_USER1);

$rootFolder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
$rootFolder = Server::get(IRootFolder::class)
->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
$node = $rootFolder->get('foo/shared');
$this->assertEquals(3, $node->getSize());

Expand All @@ -594,14 +596,14 @@ public function testWatcherRootChange() {
$share = $this->shareManager->createShare($share);
$share->setStatus(IShare::STATUS_ACCEPTED);
$this->shareManager->updateShare($share);
\OC_Util::tearDownFS();
Server::get(SetupManager::class)->tearDown();

self::loginHelper(self::TEST_FILES_SHARING_API_USER2);

$view = Filesystem::getView();

$sourceStorage->rmdir('shared');
$this->assertTrue($sourceStorage->rmdir('shared'));

$this->assertFalse($view->getFileInfo('shared'));
$this->assertFalse(Server::get(IRootFolder::class)
->getUserFolder(self::TEST_FILES_SHARING_API_USER2)
->nodeExists('shared'));
}
}
75 changes: 42 additions & 33 deletions lib/private/Files/Cache/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,41 +148,50 @@ 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'];
}
if (isset($data['f_permissions'])) {
$data['scan_permissions'] ??= $data['f_permissions'];
}
$data['permissions'] = (int)$data['permissions'];
if (isset($data['creation_time'])) {
$data['creation_time'] = (int)$data['creation_time'];
}
if (isset($data['upload_time'])) {
$data['upload_time'] = (int)$data['upload_time'];
public static function cacheEntryFromData(array $data, IMimeTypeLoader $mimetypeLoader): CacheEntry {
$normalized = [
'name' => (string)$data['name'],
'etag' => (string)$data['etag'],
'path' => (string)$data['path'],
'path_hash' => (string)$data['path_hash'],
'checksum' => (string)$data['checksum'],
'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_string_id' => isset($data['storage_string_id']) ? (string)$data['storage_string_id'] : null,
'storage' => (int)$data['storage'],
'mimetype' => $mimetypeLoader->getMimetypeById($data['mimetype']),
'mimepart' => $mimetypeLoader->getMimetypeById($data['mimepart']),
'permissions' => (int)$data['permissions'],
'creation_time' => isset($data['creation_time']) ? (int)$data['creation_time'] : null,
'upload_time' => isset($data['upload_time']) ? (int)$data['upload_time'] : null,
'metadata_etag' => isset($data['metadata_etag']) ? (string)$data['metadata_etag'] : null,
'scan_permissions' => $data['scan_permissions'] ?? ($data['f_permissions'] ?? null),
'metadata' => $data['metadata'] ?? null,
'meta_json' => $data['meta_json'] ?? null,
'meta_sync_token' => $data['meta_sync_token'] ?? null,
];

if (isset($data['folder_id'])) {
// groupfolders specific fields
$normalized['folder_id'] = (int)$data['folder_id'];
$normalized['mount_point'] = (string)$data['mount_point'];
$normalized['quota'] = $data['quota'];
$normalized['acl'] = (int)$data['acl'];
$normalized['acl_default_no_permission'] = (int)$data['acl_default_no_permission'];
$normalized['storage_id'] = (int)$data['storage_id'];
$normalized['root_id'] = (int)$data['root_id'];
$normalized['options'] = (string)$data['options'];
}
return new CacheEntry($data);

return new CacheEntry($normalized);
}

/**
Expand Down
10 changes: 3 additions & 7 deletions lib/private/Files/Cache/CacheEntry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading