nextcloud / server

tests/lib/Files/Cache/FileAccessTest.php

Indentation +424 added lines, -424 removed lines

@@ -23,428 +23,428 @@
  * @group DB
  */
 class FileAccessTest extends TestCase {
-	private IDBConnection $dbConnection;
-	private FileAccess $fileAccess;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		// Setup the actual database connection (assume the database is configured properly in PHPUnit setup)
-		$this->dbConnection = Server::get(IDBConnection::class);
-
-		// Ensure FileAccess is instantiated with the real connection
-		$this->fileAccess = new FileAccess(
-			$this->dbConnection,
-			Server::get(SystemConfig::class),
-			Server::get(LoggerInterface::class),
-			Server::get(FilesMetadataManager::class),
-			Server::get(IMimeTypeLoader::class)
-		);
-
-		// Clear and prepare `filecache` table for tests
-		$queryBuilder = $this->dbConnection->getQueryBuilder()->runAcrossAllShards();
-		$queryBuilder->delete('filecache')->executeStatement();
-
-		// Clean up potential leftovers from other tests
-		$queryBuilder = $this->dbConnection->getQueryBuilder();
-		$queryBuilder->delete('mounts')->executeStatement();
-
-
-		$this->setUpTestDatabaseForGetDistinctMounts();
-		$this->setUpTestDatabaseForGetByAncestorInStorage();
-	}
-
-	private function setUpTestDatabaseForGetDistinctMounts(): void {
-		$queryBuilder = $this->dbConnection->getQueryBuilder();
-
-		// Insert test data
-		$queryBuilder->insert('mounts')
-			->values([
-				'storage_id' => $queryBuilder->createNamedParameter(1, IQueryBuilder::PARAM_INT),
-				'root_id' => $queryBuilder->createNamedParameter(10, IQueryBuilder::PARAM_INT),
-				'mount_provider_class' => $queryBuilder->createNamedParameter('TestProviderClass1'),
-				'mount_point' => $queryBuilder->createNamedParameter('/files'),
-				'user_id' => $queryBuilder->createNamedParameter('test'),
-			])
-			->executeStatement();
-
-		$queryBuilder->insert('mounts')
-			->values([
-				'storage_id' => $queryBuilder->createNamedParameter(3, IQueryBuilder::PARAM_INT),
-				'root_id' => $queryBuilder->createNamedParameter(30, IQueryBuilder::PARAM_INT),
-				'mount_provider_class' => $queryBuilder->createNamedParameter('TestProviderClass1'),
-				'mount_point' => $queryBuilder->createNamedParameter('/documents'),
-				'user_id' => $queryBuilder->createNamedParameter('test'),
-			])
-			->executeStatement();
-
-		$queryBuilder->insert('mounts')
-			->values([
-				'storage_id' => $queryBuilder->createNamedParameter(4, IQueryBuilder::PARAM_INT),
-				'root_id' => $queryBuilder->createNamedParameter(31, IQueryBuilder::PARAM_INT),
-				'mount_provider_class' => $queryBuilder->createNamedParameter('TestProviderClass2'),
-				'mount_point' => $queryBuilder->createNamedParameter('/foobar'),
-				'user_id' => $queryBuilder->createNamedParameter('test'),
-			])
-			->executeStatement();
-	}
-
-	/**
-	 * Test that getDistinctMounts returns all mounts without filters
-	 */
-	public function testGetDistinctMountsWithoutFilters(): void {
-		$result = iterator_to_array($this->fileAccess->getDistinctMounts([], false));
-
-		$this->assertCount(3, $result);
-
-		$this->assertEquals([
-			'storage_id' => 1,
-			'root_id' => 10,
-			'overridden_root' => 10,
-		], $result[0]);
-
-		$this->assertEquals([
-			'storage_id' => 3,
-			'root_id' => 30,
-			'overridden_root' => 30,
-		], $result[1]);
-
-		$this->assertEquals([
-			'storage_id' => 4,
-			'root_id' => 31,
-			'overridden_root' => 31,
-		], $result[2]);
-	}
-
-	/**
-	 * Test that getDistinctMounts applies filtering by mount providers
-	 */
-	public function testGetDistinctMountsWithMountProviderFilter(): void {
-		$result = iterator_to_array($this->fileAccess->getDistinctMounts(['TestProviderClass1'], false));
-
-		$this->assertCount(2, $result);
-
-		$this->assertEquals([
-			'storage_id' => 1,
-			'root_id' => 10,
-			'overridden_root' => 10,
-		], $result[0]);
-
-		$this->assertEquals([
-			'storage_id' => 3,
-			'root_id' => 30,
-			'overridden_root' => 30,
-		], $result[1]);
-	}
-
-	/**
-	 * Test that getDistinctMounts rewrites home directory paths
-	 */
-	public function testGetDistinctMountsWithRewriteHomeDirectories(): void {
-		// Add additional test data for a home directory mount
-		$queryBuilder = $this->dbConnection->getQueryBuilder();
-		$queryBuilder->insert('mounts')
-			->values([
-				'storage_id' => $queryBuilder->createNamedParameter(4, IQueryBuilder::PARAM_INT),
-				'root_id' => $queryBuilder->createNamedParameter(40, IQueryBuilder::PARAM_INT),
-				'mount_provider_class' => $queryBuilder->createNamedParameter(LocalHomeMountProvider::class),
-				'mount_point' => $queryBuilder->createNamedParameter('/home/user'),
-				'user_id' => $queryBuilder->createNamedParameter('test'),
-			])
-			->executeStatement();
-
-		// Add a mount that is mounted in the home directory
-		$queryBuilder = $this->dbConnection->getQueryBuilder();
-		$queryBuilder->insert('mounts')
-			->values([
-				'storage_id' => $queryBuilder->createNamedParameter(5, IQueryBuilder::PARAM_INT),
-				'root_id' => $queryBuilder->createNamedParameter(41, IQueryBuilder::PARAM_INT),
-				'mount_provider_class' => $queryBuilder->createNamedParameter('TestMountProvider3'),
-				'mount_point' => $queryBuilder->createNamedParameter('/test/files/foobar'),
-				'user_id' => $queryBuilder->createNamedParameter('test'),
-			])
-			->executeStatement();
-
-		// Simulate adding a "files" directory to the filecache table
-		$queryBuilder = $this->dbConnection->getQueryBuilder()->runAcrossAllShards();
-		$queryBuilder->delete('filecache')->executeStatement();
-		$queryBuilder = $this->dbConnection->getQueryBuilder();
-		$queryBuilder->insert('filecache')
-			->values([
-				'fileid' => $queryBuilder->createNamedParameter(99, IQueryBuilder::PARAM_INT),
-				'storage' => $queryBuilder->createNamedParameter(4, IQueryBuilder::PARAM_INT),
-				'parent' => $queryBuilder->createNamedParameter(40),
-				'name' => $queryBuilder->createNamedParameter('files'),
-				'path' => $queryBuilder->createNamedParameter('files'),
-				'path_hash' => $queryBuilder->createNamedParameter(md5('files')),
-			])
-			->executeStatement();
-
-		$result = iterator_to_array($this->fileAccess->getDistinctMounts());
-
-		$this->assertCount(2, $result);
-
-		$this->assertEquals([
-			'storage_id' => 4,
-			'root_id' => 40,
-			'overridden_root' => 99,
-		], $result[0]);
-
-		$this->assertEquals([
-			'storage_id' => 5,
-			'root_id' => 41,
-			'overridden_root' => 41,
-		], $result[1]);
-	}
-
-	private function setUpTestDatabaseForGetByAncestorInStorage(): void {
-		// prepare `filecache` table for tests
-		$queryBuilder = $this->dbConnection->getQueryBuilder();
-
-		$queryBuilder->insert('filecache')
-			->values([
-				'fileid' => 1,
-				'parent' => 0,
-				'path' => $queryBuilder->createNamedParameter('files'),
-				'path_hash' => $queryBuilder->createNamedParameter(md5('files')),
-				'storage' => $queryBuilder->createNamedParameter(1),
-				'name' => $queryBuilder->createNamedParameter('files'),
-				'mimetype' => 1,
-				'encrypted' => 0,
-				'size' => 1,
-			])
-			->executeStatement();
-
-		$queryBuilder->insert('filecache')
-			->values([
-				'fileid' => 2,
-				'parent' => 1,
-				'path' => $queryBuilder->createNamedParameter('files/documents'),
-				'path_hash' => $queryBuilder->createNamedParameter(md5('files/documents')),
-				'storage' => $queryBuilder->createNamedParameter(1),
-				'name' => $queryBuilder->createNamedParameter('documents'),
-				'mimetype' => 2,
-				'encrypted' => 1,
-				'size' => 1,
-			])
-			->executeStatement();
-
-		$queryBuilder->insert('filecache')
-			->values([
-				'fileid' => 3,
-				'parent' => 1,
-				'path' => $queryBuilder->createNamedParameter('files/photos'),
-				'path_hash' => $queryBuilder->createNamedParameter(md5('files/photos')),
-				'storage' => $queryBuilder->createNamedParameter(1),
-				'name' => $queryBuilder->createNamedParameter('photos'),
-				'mimetype' => 3,
-				'encrypted' => 1,
-				'size' => 1,
-			])
-			->executeStatement();
-
-		$queryBuilder->insert('filecache')
-			->values([
-				'fileid' => 4,
-				'parent' => 3,
-				'path' => $queryBuilder->createNamedParameter('files/photos/endtoendencrypted'),
-				'path_hash' => $queryBuilder->createNamedParameter(md5('files/photos/endtoendencrypted')),
-				'storage' => $queryBuilder->createNamedParameter(1),
-				'name' => $queryBuilder->createNamedParameter('endtoendencrypted'),
-				'mimetype' => 4,
-				'encrypted' => 0,
-				'size' => 1,
-			])
-			->executeStatement();
-
-		$queryBuilder->insert('filecache')
-			->values([
-				'fileid' => 5,
-				'parent' => 1,
-				'path' => $queryBuilder->createNamedParameter('files/serversideencrypted'),
-				'path_hash' => $queryBuilder->createNamedParameter(md5('files/serversideencrypted')),
-				'storage' => $queryBuilder->createNamedParameter(1),
-				'name' => $queryBuilder->createNamedParameter('serversideencrypted'),
-				'mimetype' => 4,
-				'encrypted' => 1,
-				'size' => 1,
-			])
-			->executeStatement();
-
-		$queryBuilder->insert('filecache')
-			->values([
-				'fileid' => 6,
-				'parent' => 0,
-				'path' => $queryBuilder->createNamedParameter('files/storage2'),
-				'path_hash' => $queryBuilder->createNamedParameter(md5('files/storage2')),
-				'storage' => $queryBuilder->createNamedParameter(2),
-				'name' => $queryBuilder->createNamedParameter('storage2'),
-				'mimetype' => 5,
-				'encrypted' => 0,
-				'size' => 1,
-			])
-			->executeStatement();
-
-		$queryBuilder->insert('filecache')
-			->values([
-				'fileid' => 7,
-				'parent' => 6,
-				'path' => $queryBuilder->createNamedParameter('files/storage2/file'),
-				'path_hash' => $queryBuilder->createNamedParameter(md5('files/storage2/file')),
-				'storage' => $queryBuilder->createNamedParameter(2),
-				'name' => $queryBuilder->createNamedParameter('file'),
-				'mimetype' => 6,
-				'encrypted' => 0,
-				'size' => 1,
-			])
-			->executeStatement();
-	}
-
-	/**
-	 * Test fetching files by ancestor in storage.
-	 */
-	public function testGetByAncestorInStorage(): void {
-		$generator = $this->fileAccess->getByAncestorInStorage(
-			1, // storageId
-			1, // rootId
-			0, // lastFileId
-			10, // maxResults
-			[], // mimeTypes
-			true, // include end-to-end encrypted files
-			true, // include server-side encrypted files
-		);
-
-		$result = iterator_to_array($generator);
-
-		$this->assertCount(4, $result);
-
-		$paths = array_map(fn (CacheEntry $entry) => $entry->getPath(), $result);
-		$this->assertEquals([
-			'files/documents',
-			'files/photos',
-			'files/photos/endtoendencrypted',
-			'files/serversideencrypted',
-		], $paths);
-	}
-
-	/**
-	 * Test filtering by mime types.
-	 */
-	public function testGetByAncestorInStorageWithMimeTypes(): void {
-		$generator = $this->fileAccess->getByAncestorInStorage(
-			1,
-			1,
-			0,
-			10,
-			[2], // Only include documents (mimetype=2)
-			true,
-			true,
-		);
-
-		$result = iterator_to_array($generator);
-
-		$this->assertCount(1, $result);
-		$this->assertEquals('files/documents', $result[0]->getPath());
-	}
-
-	/**
-	 * Test excluding end-to-end encrypted files.
-	 */
-	public function testGetByAncestorInStorageWithoutEndToEndEncrypted(): void {
-		$generator = $this->fileAccess->getByAncestorInStorage(
-			1,
-			1,
-			0,
-			10,
-			[],
-			false, // exclude end-to-end encrypted files
-			true,
-		);
-
-		$result = iterator_to_array($generator);
-
-		$this->assertCount(3, $result);
-		$paths = array_map(fn (CacheEntry $entry) => $entry->getPath(), $result);
-		$this->assertEquals(['files/documents', 'files/photos', 'files/serversideencrypted'], $paths);
-	}
-
-	/**
-	 * Test excluding server-side encrypted files.
-	 */
-	public function testGetByAncestorInStorageWithoutServerSideEncrypted(): void {
-		$generator = $this->fileAccess->getByAncestorInStorage(
-			1,
-			1,
-			0,
-			10,
-			[],
-			true,
-			false, // exclude server-side encrypted files
-		);
-
-		$result = iterator_to_array($generator);
-
-		$this->assertCount(1, $result);
-		$this->assertEquals('files/photos/endtoendencrypted', $result[0]->getPath());
-	}
-
-	/**
-	 * Test max result limits.
-	 */
-	public function testGetByAncestorInStorageWithMaxResults(): void {
-		$generator = $this->fileAccess->getByAncestorInStorage(
-			1,
-			1,
-			0,
-			1, // Limit to 1 result
-			[],
-			true,
-			true,
-		);
-
-		$result = iterator_to_array($generator);
-
-		$this->assertCount(1, $result);
-		$this->assertEquals('files/documents', $result[0]->getPath());
-	}
-
-	/**
-	 * Test rootId filter
-	 */
-	public function testGetByAncestorInStorageWithRootIdFilter(): void {
-		$generator = $this->fileAccess->getByAncestorInStorage(
-			1,
-			3, // Filter by rootId
-			0,
-			10,
-			[],
-			true,
-			true,
-		);
-
-		$result = iterator_to_array($generator);
-
-		$this->assertCount(1, $result);
-		$this->assertEquals('files/photos/endtoendencrypted', $result[0]->getPath());
-	}
-
-	/**
-	 * Test rootId filter
-	 */
-	public function testGetByAncestorInStorageWithStorageFilter(): void {
-		$generator = $this->fileAccess->getByAncestorInStorage(
-			2, // Filter by storage
-			6, // and by rootId
-			0,
-			10,
-			[],
-			true,
-			true,
-		);
-
-		$result = iterator_to_array($generator);
-
-		$this->assertCount(1, $result);
-		$this->assertEquals('files/storage2/file', $result[0]->getPath());
-	}
+    private IDBConnection $dbConnection;
+    private FileAccess $fileAccess;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        // Setup the actual database connection (assume the database is configured properly in PHPUnit setup)
+        $this->dbConnection = Server::get(IDBConnection::class);
+
+        // Ensure FileAccess is instantiated with the real connection
+        $this->fileAccess = new FileAccess(
+            $this->dbConnection,
+            Server::get(SystemConfig::class),
+            Server::get(LoggerInterface::class),
+            Server::get(FilesMetadataManager::class),
+            Server::get(IMimeTypeLoader::class)
+        );
+
+        // Clear and prepare `filecache` table for tests
+        $queryBuilder = $this->dbConnection->getQueryBuilder()->runAcrossAllShards();
+        $queryBuilder->delete('filecache')->executeStatement();
+
+        // Clean up potential leftovers from other tests
+        $queryBuilder = $this->dbConnection->getQueryBuilder();
+        $queryBuilder->delete('mounts')->executeStatement();
+
+
+        $this->setUpTestDatabaseForGetDistinctMounts();
+        $this->setUpTestDatabaseForGetByAncestorInStorage();
+    }
+
+    private function setUpTestDatabaseForGetDistinctMounts(): void {
+        $queryBuilder = $this->dbConnection->getQueryBuilder();
+
+        // Insert test data
+        $queryBuilder->insert('mounts')
+            ->values([
+                'storage_id' => $queryBuilder->createNamedParameter(1, IQueryBuilder::PARAM_INT),
+                'root_id' => $queryBuilder->createNamedParameter(10, IQueryBuilder::PARAM_INT),
+                'mount_provider_class' => $queryBuilder->createNamedParameter('TestProviderClass1'),
+                'mount_point' => $queryBuilder->createNamedParameter('/files'),
+                'user_id' => $queryBuilder->createNamedParameter('test'),
+            ])
+            ->executeStatement();
+
+        $queryBuilder->insert('mounts')
+            ->values([
+                'storage_id' => $queryBuilder->createNamedParameter(3, IQueryBuilder::PARAM_INT),
+                'root_id' => $queryBuilder->createNamedParameter(30, IQueryBuilder::PARAM_INT),
+                'mount_provider_class' => $queryBuilder->createNamedParameter('TestProviderClass1'),
+                'mount_point' => $queryBuilder->createNamedParameter('/documents'),
+                'user_id' => $queryBuilder->createNamedParameter('test'),
+            ])
+            ->executeStatement();
+
+        $queryBuilder->insert('mounts')
+            ->values([
+                'storage_id' => $queryBuilder->createNamedParameter(4, IQueryBuilder::PARAM_INT),
+                'root_id' => $queryBuilder->createNamedParameter(31, IQueryBuilder::PARAM_INT),
+                'mount_provider_class' => $queryBuilder->createNamedParameter('TestProviderClass2'),
+                'mount_point' => $queryBuilder->createNamedParameter('/foobar'),
+                'user_id' => $queryBuilder->createNamedParameter('test'),
+            ])
+            ->executeStatement();
+    }
+
+    /**
+     * Test that getDistinctMounts returns all mounts without filters
+     */
+    public function testGetDistinctMountsWithoutFilters(): void {
+        $result = iterator_to_array($this->fileAccess->getDistinctMounts([], false));
+
+        $this->assertCount(3, $result);
+
+        $this->assertEquals([
+            'storage_id' => 1,
+            'root_id' => 10,
+            'overridden_root' => 10,
+        ], $result[0]);
+
+        $this->assertEquals([
+            'storage_id' => 3,
+            'root_id' => 30,
+            'overridden_root' => 30,
+        ], $result[1]);
+
+        $this->assertEquals([
+            'storage_id' => 4,
+            'root_id' => 31,
+            'overridden_root' => 31,
+        ], $result[2]);
+    }
+
+    /**
+     * Test that getDistinctMounts applies filtering by mount providers
+     */
+    public function testGetDistinctMountsWithMountProviderFilter(): void {
+        $result = iterator_to_array($this->fileAccess->getDistinctMounts(['TestProviderClass1'], false));
+
+        $this->assertCount(2, $result);
+
+        $this->assertEquals([
+            'storage_id' => 1,
+            'root_id' => 10,
+            'overridden_root' => 10,
+        ], $result[0]);
+
+        $this->assertEquals([
+            'storage_id' => 3,
+            'root_id' => 30,
+            'overridden_root' => 30,
+        ], $result[1]);
+    }
+
+    /**
+     * Test that getDistinctMounts rewrites home directory paths
+     */
+    public function testGetDistinctMountsWithRewriteHomeDirectories(): void {
+        // Add additional test data for a home directory mount
+        $queryBuilder = $this->dbConnection->getQueryBuilder();
+        $queryBuilder->insert('mounts')
+            ->values([
+                'storage_id' => $queryBuilder->createNamedParameter(4, IQueryBuilder::PARAM_INT),
+                'root_id' => $queryBuilder->createNamedParameter(40, IQueryBuilder::PARAM_INT),
+                'mount_provider_class' => $queryBuilder->createNamedParameter(LocalHomeMountProvider::class),
+                'mount_point' => $queryBuilder->createNamedParameter('/home/user'),
+                'user_id' => $queryBuilder->createNamedParameter('test'),
+            ])
+            ->executeStatement();
+
+        // Add a mount that is mounted in the home directory
+        $queryBuilder = $this->dbConnection->getQueryBuilder();
+        $queryBuilder->insert('mounts')
+            ->values([
+                'storage_id' => $queryBuilder->createNamedParameter(5, IQueryBuilder::PARAM_INT),
+                'root_id' => $queryBuilder->createNamedParameter(41, IQueryBuilder::PARAM_INT),
+                'mount_provider_class' => $queryBuilder->createNamedParameter('TestMountProvider3'),
+                'mount_point' => $queryBuilder->createNamedParameter('/test/files/foobar'),
+                'user_id' => $queryBuilder->createNamedParameter('test'),
+            ])
+            ->executeStatement();
+
+        // Simulate adding a "files" directory to the filecache table
+        $queryBuilder = $this->dbConnection->getQueryBuilder()->runAcrossAllShards();
+        $queryBuilder->delete('filecache')->executeStatement();
+        $queryBuilder = $this->dbConnection->getQueryBuilder();
+        $queryBuilder->insert('filecache')
+            ->values([
+                'fileid' => $queryBuilder->createNamedParameter(99, IQueryBuilder::PARAM_INT),
+                'storage' => $queryBuilder->createNamedParameter(4, IQueryBuilder::PARAM_INT),
+                'parent' => $queryBuilder->createNamedParameter(40),
+                'name' => $queryBuilder->createNamedParameter('files'),
+                'path' => $queryBuilder->createNamedParameter('files'),
+                'path_hash' => $queryBuilder->createNamedParameter(md5('files')),
+            ])
+            ->executeStatement();
+
+        $result = iterator_to_array($this->fileAccess->getDistinctMounts());
+
+        $this->assertCount(2, $result);
+
+        $this->assertEquals([
+            'storage_id' => 4,
+            'root_id' => 40,
+            'overridden_root' => 99,
+        ], $result[0]);
+
+        $this->assertEquals([
+            'storage_id' => 5,
+            'root_id' => 41,
+            'overridden_root' => 41,
+        ], $result[1]);
+    }
+
+    private function setUpTestDatabaseForGetByAncestorInStorage(): void {
+        // prepare `filecache` table for tests
+        $queryBuilder = $this->dbConnection->getQueryBuilder();
+
+        $queryBuilder->insert('filecache')
+            ->values([
+                'fileid' => 1,
+                'parent' => 0,
+                'path' => $queryBuilder->createNamedParameter('files'),
+                'path_hash' => $queryBuilder->createNamedParameter(md5('files')),
+                'storage' => $queryBuilder->createNamedParameter(1),
+                'name' => $queryBuilder->createNamedParameter('files'),
+                'mimetype' => 1,
+                'encrypted' => 0,
+                'size' => 1,
+            ])
+            ->executeStatement();
+
+        $queryBuilder->insert('filecache')
+            ->values([
+                'fileid' => 2,
+                'parent' => 1,
+                'path' => $queryBuilder->createNamedParameter('files/documents'),
+                'path_hash' => $queryBuilder->createNamedParameter(md5('files/documents')),
+                'storage' => $queryBuilder->createNamedParameter(1),
+                'name' => $queryBuilder->createNamedParameter('documents'),
+                'mimetype' => 2,
+                'encrypted' => 1,
+                'size' => 1,
+            ])
+            ->executeStatement();
+
+        $queryBuilder->insert('filecache')
+            ->values([
+                'fileid' => 3,
+                'parent' => 1,
+                'path' => $queryBuilder->createNamedParameter('files/photos'),
+                'path_hash' => $queryBuilder->createNamedParameter(md5('files/photos')),
+                'storage' => $queryBuilder->createNamedParameter(1),
+                'name' => $queryBuilder->createNamedParameter('photos'),
+                'mimetype' => 3,
+                'encrypted' => 1,
+                'size' => 1,
+            ])
+            ->executeStatement();
+
+        $queryBuilder->insert('filecache')
+            ->values([
+                'fileid' => 4,
+                'parent' => 3,
+                'path' => $queryBuilder->createNamedParameter('files/photos/endtoendencrypted'),
+                'path_hash' => $queryBuilder->createNamedParameter(md5('files/photos/endtoendencrypted')),
+                'storage' => $queryBuilder->createNamedParameter(1),
+                'name' => $queryBuilder->createNamedParameter('endtoendencrypted'),
+                'mimetype' => 4,
+                'encrypted' => 0,
+                'size' => 1,
+            ])
+            ->executeStatement();
+
+        $queryBuilder->insert('filecache')
+            ->values([
+                'fileid' => 5,
+                'parent' => 1,
+                'path' => $queryBuilder->createNamedParameter('files/serversideencrypted'),
+                'path_hash' => $queryBuilder->createNamedParameter(md5('files/serversideencrypted')),
+                'storage' => $queryBuilder->createNamedParameter(1),
+                'name' => $queryBuilder->createNamedParameter('serversideencrypted'),
+                'mimetype' => 4,
+                'encrypted' => 1,
+                'size' => 1,
+            ])
+            ->executeStatement();
+
+        $queryBuilder->insert('filecache')
+            ->values([
+                'fileid' => 6,
+                'parent' => 0,
+                'path' => $queryBuilder->createNamedParameter('files/storage2'),
+                'path_hash' => $queryBuilder->createNamedParameter(md5('files/storage2')),
+                'storage' => $queryBuilder->createNamedParameter(2),
+                'name' => $queryBuilder->createNamedParameter('storage2'),
+                'mimetype' => 5,
+                'encrypted' => 0,
+                'size' => 1,
+            ])
+            ->executeStatement();
+
+        $queryBuilder->insert('filecache')
+            ->values([
+                'fileid' => 7,
+                'parent' => 6,
+                'path' => $queryBuilder->createNamedParameter('files/storage2/file'),
+                'path_hash' => $queryBuilder->createNamedParameter(md5('files/storage2/file')),
+                'storage' => $queryBuilder->createNamedParameter(2),
+                'name' => $queryBuilder->createNamedParameter('file'),
+                'mimetype' => 6,
+                'encrypted' => 0,
+                'size' => 1,
+            ])
+            ->executeStatement();
+    }
+
+    /**
+     * Test fetching files by ancestor in storage.
+     */
+    public function testGetByAncestorInStorage(): void {
+        $generator = $this->fileAccess->getByAncestorInStorage(
+            1, // storageId
+            1, // rootId
+            0, // lastFileId
+            10, // maxResults
+            [], // mimeTypes
+            true, // include end-to-end encrypted files
+            true, // include server-side encrypted files
+        );
+
+        $result = iterator_to_array($generator);
+
+        $this->assertCount(4, $result);
+
+        $paths = array_map(fn (CacheEntry $entry) => $entry->getPath(), $result);
+        $this->assertEquals([
+            'files/documents',
+            'files/photos',
+            'files/photos/endtoendencrypted',
+            'files/serversideencrypted',
+        ], $paths);
+    }
+
+    /**
+     * Test filtering by mime types.
+     */
+    public function testGetByAncestorInStorageWithMimeTypes(): void {
+        $generator = $this->fileAccess->getByAncestorInStorage(
+            1,
+            1,
+            0,
+            10,
+            [2], // Only include documents (mimetype=2)
+            true,
+            true,
+        );
+
+        $result = iterator_to_array($generator);
+
+        $this->assertCount(1, $result);
+        $this->assertEquals('files/documents', $result[0]->getPath());
+    }
+
+    /**
+     * Test excluding end-to-end encrypted files.
+     */
+    public function testGetByAncestorInStorageWithoutEndToEndEncrypted(): void {
+        $generator = $this->fileAccess->getByAncestorInStorage(
+            1,
+            1,
+            0,
+            10,
+            [],
+            false, // exclude end-to-end encrypted files
+            true,
+        );
+
+        $result = iterator_to_array($generator);
+
+        $this->assertCount(3, $result);
+        $paths = array_map(fn (CacheEntry $entry) => $entry->getPath(), $result);
+        $this->assertEquals(['files/documents', 'files/photos', 'files/serversideencrypted'], $paths);
+    }
+
+    /**
+     * Test excluding server-side encrypted files.
+     */
+    public function testGetByAncestorInStorageWithoutServerSideEncrypted(): void {
+        $generator = $this->fileAccess->getByAncestorInStorage(
+            1,
+            1,
+            0,
+            10,
+            [],
+            true,
+            false, // exclude server-side encrypted files
+        );
+
+        $result = iterator_to_array($generator);
+
+        $this->assertCount(1, $result);
+        $this->assertEquals('files/photos/endtoendencrypted', $result[0]->getPath());
+    }
+
+    /**
+     * Test max result limits.
+     */
+    public function testGetByAncestorInStorageWithMaxResults(): void {
+        $generator = $this->fileAccess->getByAncestorInStorage(
+            1,
+            1,
+            0,
+            1, // Limit to 1 result
+            [],
+            true,
+            true,
+        );
+
+        $result = iterator_to_array($generator);
+
+        $this->assertCount(1, $result);
+        $this->assertEquals('files/documents', $result[0]->getPath());
+    }
+
+    /**
+     * Test rootId filter
+     */
+    public function testGetByAncestorInStorageWithRootIdFilter(): void {
+        $generator = $this->fileAccess->getByAncestorInStorage(
+            1,
+            3, // Filter by rootId
+            0,
+            10,
+            [],
+            true,
+            true,
+        );
+
+        $result = iterator_to_array($generator);
+
+        $this->assertCount(1, $result);
+        $this->assertEquals('files/photos/endtoendencrypted', $result[0]->getPath());
+    }
+
+    /**
+     * Test rootId filter
+     */
+    public function testGetByAncestorInStorageWithStorageFilter(): void {
+        $generator = $this->fileAccess->getByAncestorInStorage(
+            2, // Filter by storage
+            6, // and by rootId
+            0,
+            10,
+            [],
+            true,
+            true,
+        );
+
+        $result = iterator_to_array($generator);
+
+        $this->assertCount(1, $result);
+        $this->assertEquals('files/storage2/file', $result[0]->getPath());
+    }
 }

lib/private/Files/Cache/FileAccess.php

Indentation +227 added lines, -227 removed lines

@@ -21,231 +21,231 @@
  * Low level access to the file cache
  */
 class FileAccess implements IFileAccess {
-	public function __construct(
-		private IDBConnection $connection,
-		private SystemConfig $systemConfig,
-		private LoggerInterface $logger,
-		private FilesMetadataManager $metadataManager,
-		private IMimeTypeLoader $mimeTypeLoader,
-	) {
-	}
-
-	private function getQuery(): CacheQueryBuilder {
-		return new CacheQueryBuilder(
-			$this->connection->getQueryBuilder(),
-			$this->metadataManager,
-		);
-	}
-
-	public function getByFileIdInStorage(int $fileId, int $storageId): ?CacheEntry {
-		$items = array_values($this->getByFileIdsInStorage([$fileId], $storageId));
-		return $items[0] ?? null;
-	}
-
-	public function getByPathInStorage(string $path, int $storageId): ?CacheEntry {
-		$query = $this->getQuery()->selectFileCache();
-		$query->andWhere($query->expr()->eq('filecache.path_hash', $query->createNamedParameter(md5($path))));
-		$query->andWhere($query->expr()->eq('filecache.storage', $query->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
-
-		$row = $query->executeQuery()->fetch();
-		return $row ? Cache::cacheEntryFromData($row, $this->mimeTypeLoader) : null;
-	}
-
-	public function getByFileId(int $fileId): ?CacheEntry {
-		$items = array_values($this->getByFileIds([$fileId]));
-		return $items[0] ?? null;
-	}
-
-	/**
-	 * @param array[] $rows
-	 * @return array<int, CacheEntry>
-	 */
-	private function rowsToEntries(array $rows): array {
-		$result = [];
-		foreach ($rows as $row) {
-			$entry = Cache::cacheEntryFromData($row, $this->mimeTypeLoader);
-			$result[$entry->getId()] = $entry;
-		}
-		return $result;
-	}
-
-	/**
-	 * @param int[] $fileIds
-	 * @return array<int, CacheEntry>
-	 */
-	public function getByFileIds(array $fileIds): array {
-		$query = $this->getQuery()->selectFileCache();
-		$query->andWhere($query->expr()->in('filecache.fileid', $query->createNamedParameter($fileIds, IQueryBuilder::PARAM_INT_ARRAY)));
-
-		$rows = $query->executeQuery()->fetchAll();
-		return $this->rowsToEntries($rows);
-	}
-
-	/**
-	 * @param int[] $fileIds
-	 * @param int $storageId
-	 * @return array<int, CacheEntry>
-	 */
-	public function getByFileIdsInStorage(array $fileIds, int $storageId): array {
-		$fileIds = array_values($fileIds);
-		$query = $this->getQuery()->selectFileCache();
-		$query->andWhere($query->expr()->in('filecache.fileid', $query->createNamedParameter($fileIds, IQueryBuilder::PARAM_INT_ARRAY)));
-		$query->andWhere($query->expr()->eq('filecache.storage', $query->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
-
-		$rows = $query->executeQuery()->fetchAll();
-		return $this->rowsToEntries($rows);
-	}
-
-	public function getByAncestorInStorage(int $storageId, int $folderId, int $fileIdCursor = 0, int $maxResults = 100, array $mimeTypeIds = [], bool $endToEndEncrypted = true, bool $serverSideEncrypted = true): \Generator {
-		$qb = $this->getQuery();
-		$qb->select('path')
-			->from('filecache')
-			->where($qb->expr()->eq('fileid', $qb->createNamedParameter($folderId, IQueryBuilder::PARAM_INT)));
-		$result = $qb->executeQuery();
-		/** @var array{path:string}|false $root */
-		$root = $result->fetch();
-		$result->closeCursor();
-
-		if ($root === false) {
-			throw new Exception('Could not fetch storage root');
-		}
-
-		$qb = $this->getQuery();
-
-		$path = $root['path'] === '' ? '' : $root['path'] . '/';
-
-		$qb->selectDistinct('f.*')
-			->from('filecache', 'f')
-			->where($qb->expr()->like('f.path', $qb->createNamedParameter($this->connection->escapeLikeParameter($path) . '%')))
-			->andWhere($qb->expr()->eq('f.storage', $qb->createNamedParameter($storageId)))
-			->andWhere($qb->expr()->gt('f.fileid', $qb->createNamedParameter($fileIdCursor, IQueryBuilder::PARAM_INT)))
-			->hintShardKey('storage', $storageId);
-
-		if (!$endToEndEncrypted && $this->connection->getShardDefinition('filecache') === null) {
-			// End to end encrypted files are descendants of a folder with encrypted=1
-			// We can only do this inner join if the filecache table is not sharded
-			$qb->innerJoin('f', 'filecache', 'f2', $qb->expr()->eq('f2.fileid', 'f.parent'));
-
-			$qb->andWhere(
-				$qb->expr()->eq('f2.encrypted', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT))
-			);
-		}
-
-		if (!$serverSideEncrypted) {
-			// Server side encrypted files have encrypted=1 directly
-			$qb->andWhere($qb->expr()->eq('f.encrypted', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
-		}
-
-		if (count($mimeTypeIds) > 0) {
-			$qb->andWhere($qb->expr()->in('f.mimetype', $qb->createNamedParameter($mimeTypeIds, IQueryBuilder::PARAM_INT_ARRAY)));
-		}
-
-		if ($maxResults !== 0) {
-			$qb->setMaxResults($maxResults);
-		}
-		$qb->orderBy('f.fileid', 'ASC');
-		$files = $qb->executeQuery();
-
-		if (!$endToEndEncrypted && $this->connection->getShardDefinition('filecache') !== null) {
-			// End to end encrypted files are descendants of a folder with encrypted=1
-			// If the filecache table is sharded we need to check with a separate query if the parent is encrypted
-			$rows = [];
-			do {
-				while (count($rows) < 1000 && ($row = $files->fetch())) {
-					$rows[] = $row;
-				}
-				$parents = array_map(function ($row) {
-					return $row['parent'];
-				}, $rows);
-
-				$parentQuery = $this->getQuery();
-				$parentQuery->select('fileid', 'encrypted')->from('filecache');
-				$parentQuery->where($parentQuery->expr()->in('fileid', $parentQuery->createNamedParameter($parents, IQueryBuilder::PARAM_INT_ARRAY)));
-				$parentQuery->hintShardKey('storage', $storageId);
-				$result = $parentQuery->executeQuery();
-				$parentRows = $result->fetchAll();
-				$result->closeCursor();
-
-				$encryptedByFileId = array_column($parentRows, 'encrypted', 'fileid');
-				foreach ($rows as $row) {
-					if ($encryptedByFileId[$row['parent']]) {
-						continue;
-					}
-					yield Cache::cacheEntryFromData($row, $this->mimeTypeLoader);
-				}
-				$rows = [];
-			} while ($rows[] = $files->fetch());
-		} else {
-			while (
-				/** @var array */
-				$row = $files->fetch()
-			) {
-				yield Cache::cacheEntryFromData($row, $this->mimeTypeLoader);
-			}
-		}
-
-		$files->closeCursor();
-	}
-
-	public function getDistinctMounts(array $mountProviders = [], bool $onlyUserFilesMounts = true): \Generator {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->selectDistinct(['root_id', 'storage_id', 'mount_provider_class'])
-			->from('mounts');
-		if ($onlyUserFilesMounts) {
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->like('mount_point', $qb->createNamedParameter('/%/files/%')),
-					$qb->expr()->in('mount_provider_class', $qb->createNamedParameter([
-						\OC\Files\Mount\LocalHomeMountProvider::class,
-						\OC\Files\Mount\ObjectHomeMountProvider::class,
-					], IQueryBuilder::PARAM_STR_ARRAY))
-				)
-			);
-		}
-		if (count($mountProviders) > 0) {
-			$qb->andWhere($qb->expr()->in('mount_provider_class', $qb->createNamedParameter($mountProviders, IQueryBuilder::PARAM_STR_ARRAY)));
-		}
-		$qb->orderBy('root_id', 'ASC');
-		$result = $qb->executeQuery();
-
-		while (
-			/** @var array{storage_id:int, root_id:int,mount_provider_class:string} $row */
-			$row = $result->fetch()
-		) {
-			$storageId = (int)$row['storage_id'];
-			$rootId = (int)$row['root_id'];
-			$overrideRoot = $rootId;
-			// LocalHomeMountProvider is the default provider for user home directories
-			// ObjectHomeMountProvider is the home directory provider for when S3 primary storage is used
-			if ($onlyUserFilesMounts && in_array($row['mount_provider_class'], [
-				\OC\Files\Mount\LocalHomeMountProvider::class,
-				\OC\Files\Mount\ObjectHomeMountProvider::class,
-			], true)) {
-				// Only crawl files, not cache or trashbin
-				$qb = $this->getQuery();
-				try {
-					$qb->select('fileid')
-						->from('filecache')
-						->where($qb->expr()->eq('storage', $qb->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
-						->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($rootId, IQueryBuilder::PARAM_INT)))
-						->andWhere($qb->expr()->eq('path', $qb->createNamedParameter('files')));
-					/** @var array|false $root */
-					$root = $qb->executeQuery()->fetch();
-					if ($root !== false) {
-						$overrideRoot = (int)$root['fileid'];
-					}
-				} catch (Exception $e) {
-					$this->logger->error('Could not fetch home storage files root for storage ' . $storageId, ['exception' => $e]);
-					continue;
-				}
-			}
-			// Reference to root_id is still necessary even if we have the overridden_root_id, because storage_id and root_id uniquely identify a mount
-			yield [
-				'storage_id' => $storageId,
-				'root_id' => $rootId,
-				'overridden_root' => $overrideRoot,
-			];
-		}
-		$result->closeCursor();
-	}
+    public function __construct(
+        private IDBConnection $connection,
+        private SystemConfig $systemConfig,
+        private LoggerInterface $logger,
+        private FilesMetadataManager $metadataManager,
+        private IMimeTypeLoader $mimeTypeLoader,
+    ) {
+    }
+
+    private function getQuery(): CacheQueryBuilder {
+        return new CacheQueryBuilder(
+            $this->connection->getQueryBuilder(),
+            $this->metadataManager,
+        );
+    }
+
+    public function getByFileIdInStorage(int $fileId, int $storageId): ?CacheEntry {
+        $items = array_values($this->getByFileIdsInStorage([$fileId], $storageId));
+        return $items[0] ?? null;
+    }
+
+    public function getByPathInStorage(string $path, int $storageId): ?CacheEntry {
+        $query = $this->getQuery()->selectFileCache();
+        $query->andWhere($query->expr()->eq('filecache.path_hash', $query->createNamedParameter(md5($path))));
+        $query->andWhere($query->expr()->eq('filecache.storage', $query->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
+
+        $row = $query->executeQuery()->fetch();
+        return $row ? Cache::cacheEntryFromData($row, $this->mimeTypeLoader) : null;
+    }
+
+    public function getByFileId(int $fileId): ?CacheEntry {
+        $items = array_values($this->getByFileIds([$fileId]));
+        return $items[0] ?? null;
+    }
+
+    /**
+     * @param array[] $rows
+     * @return array<int, CacheEntry>
+     */
+    private function rowsToEntries(array $rows): array {
+        $result = [];
+        foreach ($rows as $row) {
+            $entry = Cache::cacheEntryFromData($row, $this->mimeTypeLoader);
+            $result[$entry->getId()] = $entry;
+        }
+        return $result;
+    }
+
+    /**
+     * @param int[] $fileIds
+     * @return array<int, CacheEntry>
+     */
+    public function getByFileIds(array $fileIds): array {
+        $query = $this->getQuery()->selectFileCache();
+        $query->andWhere($query->expr()->in('filecache.fileid', $query->createNamedParameter($fileIds, IQueryBuilder::PARAM_INT_ARRAY)));
+
+        $rows = $query->executeQuery()->fetchAll();
+        return $this->rowsToEntries($rows);
+    }
+
+    /**
+     * @param int[] $fileIds
+     * @param int $storageId
+     * @return array<int, CacheEntry>
+     */
+    public function getByFileIdsInStorage(array $fileIds, int $storageId): array {
+        $fileIds = array_values($fileIds);
+        $query = $this->getQuery()->selectFileCache();
+        $query->andWhere($query->expr()->in('filecache.fileid', $query->createNamedParameter($fileIds, IQueryBuilder::PARAM_INT_ARRAY)));
+        $query->andWhere($query->expr()->eq('filecache.storage', $query->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
+
+        $rows = $query->executeQuery()->fetchAll();
+        return $this->rowsToEntries($rows);
+    }
+
+    public function getByAncestorInStorage(int $storageId, int $folderId, int $fileIdCursor = 0, int $maxResults = 100, array $mimeTypeIds = [], bool $endToEndEncrypted = true, bool $serverSideEncrypted = true): \Generator {
+        $qb = $this->getQuery();
+        $qb->select('path')
+            ->from('filecache')
+            ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($folderId, IQueryBuilder::PARAM_INT)));
+        $result = $qb->executeQuery();
+        /** @var array{path:string}|false $root */
+        $root = $result->fetch();
+        $result->closeCursor();
+
+        if ($root === false) {
+            throw new Exception('Could not fetch storage root');
+        }
+
+        $qb = $this->getQuery();
+
+        $path = $root['path'] === '' ? '' : $root['path'] . '/';
+
+        $qb->selectDistinct('f.*')
+            ->from('filecache', 'f')
+            ->where($qb->expr()->like('f.path', $qb->createNamedParameter($this->connection->escapeLikeParameter($path) . '%')))
+            ->andWhere($qb->expr()->eq('f.storage', $qb->createNamedParameter($storageId)))
+            ->andWhere($qb->expr()->gt('f.fileid', $qb->createNamedParameter($fileIdCursor, IQueryBuilder::PARAM_INT)))
+            ->hintShardKey('storage', $storageId);
+
+        if (!$endToEndEncrypted && $this->connection->getShardDefinition('filecache') === null) {
+            // End to end encrypted files are descendants of a folder with encrypted=1
+            // We can only do this inner join if the filecache table is not sharded
+            $qb->innerJoin('f', 'filecache', 'f2', $qb->expr()->eq('f2.fileid', 'f.parent'));
+
+            $qb->andWhere(
+                $qb->expr()->eq('f2.encrypted', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT))
+            );
+        }
+
+        if (!$serverSideEncrypted) {
+            // Server side encrypted files have encrypted=1 directly
+            $qb->andWhere($qb->expr()->eq('f.encrypted', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
+        }
+
+        if (count($mimeTypeIds) > 0) {
+            $qb->andWhere($qb->expr()->in('f.mimetype', $qb->createNamedParameter($mimeTypeIds, IQueryBuilder::PARAM_INT_ARRAY)));
+        }
+
+        if ($maxResults !== 0) {
+            $qb->setMaxResults($maxResults);
+        }
+        $qb->orderBy('f.fileid', 'ASC');
+        $files = $qb->executeQuery();
+
+        if (!$endToEndEncrypted && $this->connection->getShardDefinition('filecache') !== null) {
+            // End to end encrypted files are descendants of a folder with encrypted=1
+            // If the filecache table is sharded we need to check with a separate query if the parent is encrypted
+            $rows = [];
+            do {
+                while (count($rows) < 1000 && ($row = $files->fetch())) {
+                    $rows[] = $row;
+                }
+                $parents = array_map(function ($row) {
+                    return $row['parent'];
+                }, $rows);
+
+                $parentQuery = $this->getQuery();
+                $parentQuery->select('fileid', 'encrypted')->from('filecache');
+                $parentQuery->where($parentQuery->expr()->in('fileid', $parentQuery->createNamedParameter($parents, IQueryBuilder::PARAM_INT_ARRAY)));
+                $parentQuery->hintShardKey('storage', $storageId);
+                $result = $parentQuery->executeQuery();
+                $parentRows = $result->fetchAll();
+                $result->closeCursor();
+
+                $encryptedByFileId = array_column($parentRows, 'encrypted', 'fileid');
+                foreach ($rows as $row) {
+                    if ($encryptedByFileId[$row['parent']]) {
+                        continue;
+                    }
+                    yield Cache::cacheEntryFromData($row, $this->mimeTypeLoader);
+                }
+                $rows = [];
+            } while ($rows[] = $files->fetch());
+        } else {
+            while (
+                /** @var array */
+                $row = $files->fetch()
+            ) {
+                yield Cache::cacheEntryFromData($row, $this->mimeTypeLoader);
+            }
+        }
+
+        $files->closeCursor();
+    }
+
+    public function getDistinctMounts(array $mountProviders = [], bool $onlyUserFilesMounts = true): \Generator {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->selectDistinct(['root_id', 'storage_id', 'mount_provider_class'])
+            ->from('mounts');
+        if ($onlyUserFilesMounts) {
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->like('mount_point', $qb->createNamedParameter('/%/files/%')),
+                    $qb->expr()->in('mount_provider_class', $qb->createNamedParameter([
+                        \OC\Files\Mount\LocalHomeMountProvider::class,
+                        \OC\Files\Mount\ObjectHomeMountProvider::class,
+                    ], IQueryBuilder::PARAM_STR_ARRAY))
+                )
+            );
+        }
+        if (count($mountProviders) > 0) {
+            $qb->andWhere($qb->expr()->in('mount_provider_class', $qb->createNamedParameter($mountProviders, IQueryBuilder::PARAM_STR_ARRAY)));
+        }
+        $qb->orderBy('root_id', 'ASC');
+        $result = $qb->executeQuery();
+
+        while (
+            /** @var array{storage_id:int, root_id:int,mount_provider_class:string} $row */
+            $row = $result->fetch()
+        ) {
+            $storageId = (int)$row['storage_id'];
+            $rootId = (int)$row['root_id'];
+            $overrideRoot = $rootId;
+            // LocalHomeMountProvider is the default provider for user home directories
+            // ObjectHomeMountProvider is the home directory provider for when S3 primary storage is used
+            if ($onlyUserFilesMounts && in_array($row['mount_provider_class'], [
+                \OC\Files\Mount\LocalHomeMountProvider::class,
+                \OC\Files\Mount\ObjectHomeMountProvider::class,
+            ], true)) {
+                // Only crawl files, not cache or trashbin
+                $qb = $this->getQuery();
+                try {
+                    $qb->select('fileid')
+                        ->from('filecache')
+                        ->where($qb->expr()->eq('storage', $qb->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
+                        ->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($rootId, IQueryBuilder::PARAM_INT)))
+                        ->andWhere($qb->expr()->eq('path', $qb->createNamedParameter('files')));
+                    /** @var array|false $root */
+                    $root = $qb->executeQuery()->fetch();
+                    if ($root !== false) {
+                        $overrideRoot = (int)$root['fileid'];
+                    }
+                } catch (Exception $e) {
+                    $this->logger->error('Could not fetch home storage files root for storage ' . $storageId, ['exception' => $e]);
+                    continue;
+                }
+            }
+            // Reference to root_id is still necessary even if we have the overridden_root_id, because storage_id and root_id uniquely identify a mount
+            yield [
+                'storage_id' => $storageId,
+                'root_id' => $rootId,
+                'overridden_root' => $overrideRoot,
+            ];
+        }
+        $result->closeCursor();
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -112,11 +112,11 @@ 
 
 		$qb = $this->getQuery();
 
-		$path = $root['path'] === '' ? '' : $root['path'] . '/';
+		$path = $root['path'] === '' ? '' : $root['path'].'/';
 
 		$qb->selectDistinct('f.*')
 			->from('filecache', 'f')
-			->where($qb->expr()->like('f.path', $qb->createNamedParameter($this->connection->escapeLikeParameter($path) . '%')))
+			->where($qb->expr()->like('f.path', $qb->createNamedParameter($this->connection->escapeLikeParameter($path).'%')))
 			->andWhere($qb->expr()->eq('f.storage', $qb->createNamedParameter($storageId)))
 			->andWhere($qb->expr()->gt('f.fileid', $qb->createNamedParameter($fileIdCursor, IQueryBuilder::PARAM_INT)))
 			->hintShardKey('storage', $storageId);
@@ -154,7 +154,7 @@ 
 				while (count($rows) < 1000 && ($row = $files->fetch())) {
 					$rows[] = $row;
 				}
-				$parents = array_map(function ($row) {
+				$parents = array_map(function($row) {
 					return $row['parent'];
 				}, $rows);
 
@@ -212,8 +212,8 @@ 
 			/** @var array{storage_id:int, root_id:int,mount_provider_class:string} $row */
 			$row = $result->fetch()
 		) {
-			$storageId = (int)$row['storage_id'];
-			$rootId = (int)$row['root_id'];
+			$storageId = (int) $row['storage_id'];
+			$rootId = (int) $row['root_id'];
 			$overrideRoot = $rootId;
 			// LocalHomeMountProvider is the default provider for user home directories
 			// ObjectHomeMountProvider is the home directory provider for when S3 primary storage is used
@@ -232,10 +232,10 @@ 
 					/** @var array|false $root */
 					$root = $qb->executeQuery()->fetch();
 					if ($root !== false) {
-						$overrideRoot = (int)$root['fileid'];
+						$overrideRoot = (int) $root['fileid'];
 					}
 				} catch (Exception $e) {
-					$this->logger->error('Could not fetch home storage files root for storage ' . $storageId, ['exception' => $e]);
+					$this->logger->error('Could not fetch home storage files root for storage '.$storageId, ['exception' => $e]);
 					continue;
 				}
 			}