Merge pull request #4338 from nextcloud/backport/4320/stable33

[stable33] Performance optimisation for high number of team folders

Author: provokateurin

lib/Controller/FolderController.php

@@ -207,11 +207,8 @@ private function checkMountPointExists(string $mountpoint): ?DataResponse {
 			throw new OCSNotFoundException('Groupfolder not found');
 		}
 
-		$folders = $this->manager->getAllFolders();
-		foreach ($folders as $folder) {
-			if ($folder->mountPoint === $mountpoint) {
-				throw new OCSBadRequestException('Mount point already exists');
-			}
+		if ($this->manager->mountPointExists($mountpoint)) {
+			throw new OCSBadRequestException('Mount point already exists');
 		}
 
 		return null;

lib/Folder/FolderManager.php

@@ -137,8 +137,6 @@ private function selectWithFileCache(?IQueryBuilder $query = null): IQueryBuilde
 	 * @throws Exception
 	 */
 	public function getAllFoldersWithSize(int $offset = 0, ?int $limit = null, string $orderBy = 'mount_point', string $order = 'ASC'): array {
-		$applicableMap = $this->getAllApplicable();
-
 		$query = $this->selectWithFileCache();
 		$query->setFirstResult($offset);
 		$query->setMaxResults($limit);
@@ -157,7 +155,9 @@ public function getAllFoldersWithSize(int $offset = 0, ?int $limit = null, strin
 
 		$rows = $query->executeQuery()->fetchAll();
 
-		$folderMappings = $this->getAllFolderMappings();
+		$folderIds = array_values(array_map(static fn (array $row): int => (int)$row['folder_id'], $rows));
+		$applicableMap = $this->getAllApplicable($folderIds);
+		$folderMappings = $this->getAllFolderMappings($folderIds);
 
 		$folderMap = [];
 		foreach ($rows as $row) {
@@ -182,7 +182,6 @@ public function getAllFoldersWithSize(int $offset = 0, ?int $limit = null, strin
 	 */
 	public function getAllFoldersForUserWithSize(IUser $user): array {
 		$groups = $this->groupManager->getUserGroupIds($user);
-		$applicableMap = $this->getAllApplicable();
 
 		$query = $this->selectWithFileCache();
 		$query->innerJoin(
@@ -196,7 +195,9 @@ public function getAllFoldersForUserWithSize(IUser $user): array {
 
 		$rows = $query->executeQuery()->fetchAll();
 
-		$folderMappings = $this->getAllFolderMappings();
+		$folderIds = array_values(array_map(static fn (array $row): int => (int)$row['folder_id'], $rows));
+		$applicableMap = $this->getAllApplicable($folderIds);
+		$folderMappings = $this->getAllFolderMappings($folderIds);
 
 		$folderMap = [];
 		foreach ($rows as $row) {
@@ -219,23 +220,27 @@ public function getAllFoldersForUserWithSize(IUser $user): array {
 	 * @return array<int, list<InternalFolderMapping>>
 	 * @throws Exception
 	 */
-	private function getAllFolderMappings(): array {
+	private function getAllFolderMappings(?array $folderIds = null): array {
+		if ($folderIds === []) {
+			return [];
+		}
+
 		$query = $this->connection->getQueryBuilder();
 
 		$query->select('*')
 			->from('group_folders_manage', 'g');
+		if ($folderIds !== null) {
+			$query->where($query->expr()->in('folder_id', $query->createNamedParameter($folderIds, IQueryBuilder::PARAM_INT_ARRAY)));
+		}
 
 		$rows = $query->executeQuery()->fetchAll();
 
 		$folderMap = [];
 		foreach ($rows as $row) {
 			$id = (int)$row['folder_id'];
 
-			if (!isset($folderMap[$id])) {
-				$folderMap[$id] = [$row];
-			} else {
-				$folderMap[$id][] = $row;
-			}
+			$folderMap[$id] ??= [];
+			$folderMap[$id][] = $row;
 		}
 
 		return $folderMap;
@@ -301,8 +306,6 @@ private function getManageAcl(array $mappings): array {
 	}
 
 	public function getFolder(int $id): ?FolderWithMappingsAndCache {
-		$applicableMap = $this->getAllApplicable();
-
 		$query = $this->selectWithFileCache();
 
 		$query->where($query->expr()->eq('f.folder_id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
@@ -314,14 +317,15 @@ public function getFolder(int $id): ?FolderWithMappingsAndCache {
 			return null;
 		}
 
+		$applicableMap = $this->getAllApplicable([$id])[$id] ?? [];
 		$folderMappings = $this->getFolderMappings($id);
 
 		$folder = $this->rowToFolder($row);
 		$id = $folder->id;
 		return FolderWithMappingsAndCache::fromFolderWithMapping(
 			FolderDefinitionWithMappings::fromFolder(
 				$folder,
-				$applicableMap[$id] ?? [],
+				$applicableMap,
 				$this->getManageAcl($folderMappings),
 			),
 			Cache::cacheEntryFromData($row, $this->mimeTypeLoader),
@@ -358,12 +362,19 @@ public function getFolderByPath(string $path): int {
 	 * @return array<int, array<string, GroupFoldersApplicable>>
 	 * @throws Exception
 	 */
-	private function getAllApplicable(): array {
+	private function getAllApplicable(?array $folderIds = null): array {
+		if ($folderIds === []) {
+			return [];
+		}
+
 		$queryHelper = $this->getCirclesManager()?->getQueryHelper();
 
 		$query = $queryHelper?->getQueryBuilder() ?? $this->connection->getQueryBuilder();
 		$query->select('g.folder_id', 'g.group_id', 'g.circle_id', 'g.permissions')
 			->from('group_folders_groups', 'g');
+		if ($folderIds !== null) {
+			$query->where($query->expr()->in('g.folder_id', $query->createNamedParameter($folderIds, IQueryBuilder::PARAM_INT_ARRAY)));
+		}
 
 		$queryHelper?->addCircleDetails('g', 'circle_id');
 
@@ -374,9 +385,7 @@ private function getAllApplicable(): array {
 
 		foreach ($rows as $row) {
 			$id = (int)$row['folder_id'];
-			if (!array_key_exists($id, $applicableMap)) {
-				$applicableMap[$id] = [];
-			}
+			$applicableMap[$id] ??= [];
 
 			if (!$row['circle_id']) {
 				$entityId = (string)$row['group_id'];
@@ -414,7 +423,7 @@ private function getAllApplicable(): array {
 	 * @throws Exception
 	 */
 	private function getGroups(int $id): array {
-		$groups = $this->getAllApplicable()[$id] ?? [];
+		$groups = $this->getAllApplicable([$id])[$id] ?? [];
 		$groups = array_map($this->groupManager->get(...), array_keys($groups));
 
 		return array_map(fn (IGroup $group): array => [
@@ -428,7 +437,7 @@ private function getGroups(int $id): array {
 	 * @throws Exception
 	 */
 	private function getCircles(int $id): array {
-		$circles = $this->getAllApplicable()[$id] ?? [];
+		$circles = $this->getAllApplicable([$id])[$id] ?? [];
 		$circles = array_map($this->getCircle(...), array_keys($circles));
 
 		// get nested teams
@@ -479,6 +488,20 @@ public function canManageACL(int $folderId, IUser $user): bool {
 		return $this->userMappingManager->userInMappings($user, $managerMappings);
 	}
 
+	public function mountPointExists(string $mountPoint): bool {
+		$query = $this->connection->getQueryBuilder();
+		$query->select($query->func()->count('*'))
+			->from('group_folders')
+			->where($query->expr()->eq('mount_point', $query->createNamedParameter($mountPoint)))
+			->setMaxResults(1);
+
+		$result = $query->executeQuery();
+		$exists = (int)$result->fetchOne() > 0;
+		$result->closeCursor();
+
+		return $exists;
+	}
+
 	/**
 	 * @return IUserMapping[]
 	 */