perf(mount-provider): allow filtering mounts for multiple paths in a single query

Signed-off-by: Cristian Scheid <cristianscheid@gmail.com>

Author: cristianscheid

lib/Db/CoreQueryBuilder.php

@@ -1576,21 +1576,26 @@ public function leftJoinMountpoint(string $aliasMount, IFederatedUser $federated
 
 	/**
 	 * @param string $aliasMount
-	 * @param string $path
+	 * @param string[] $paths
 	 * @param bool $forChildren
-	 *
-	 * @throws RequestBuilderException
 	 */
-	public function limitToMountpoint(string $aliasMount, string $path, bool $forChildren = false): void {
+	public function limitToMountpoints(string $aliasMount, array $paths, bool $forChildren = false): void {
+		if (count($paths) === 0) {
+			return;
+		}
+
+		$expr = $this->expr();
+		$orX = $expr->orX();
+
 		if ($forChildren) {
-			$this->andWhere(
-				$this->expr()->like($aliasMount . '.mountpoint', $this->createNamedParameter($path . '/%'))
-			);
+			foreach ($paths as $path) {
+				$orX->add($expr->like($aliasMount . '.mountpoint', $this->createNamedParameter($path . '/%')));
+			}
 		} else {
-			$this->andWhere(
-				$this->expr()->eq($aliasMount . '.mountpoint', $this->createNamedParameter($path))
-			);
+			$orX->add($expr->in($aliasMount . '.mountpoint', $this->createNamedParameter($paths, IQueryBuilder::PARAM_STR_ARRAY)));
 		}
+
+		$this->andWhere($orX);
 	}
 
 

lib/Db/MountRequest.php

@@ -58,20 +58,20 @@ public function delete(string $token): void {
 
 	/**
 	 * @param IFederatedUser $federatedUser
-	 * @param string|null $path
+	 * @param string[] $paths
 	 * @param bool $forChildren
 	 *
 	 * @return Mount[]
 	 * @throws RequestBuilderException
 	 */
-	public function getForUser(IFederatedUser $federatedUser, ?string $path = null, bool $forChildren = false): array {
+	public function getForUser(IFederatedUser $federatedUser, array $paths = [], bool $forChildren = false): array {
 		$qb = $this->getMountSelectSql();
 		$qb->setOptions([CoreQueryBuilder::MOUNT], ['getData' => true]);
 		$qb->leftJoinMember(CoreQueryBuilder::MOUNT);
 		$qb->leftJoinMountpoint(CoreQueryBuilder::MOUNT, $federatedUser);
 		$qb->limitToInitiator(CoreQueryBuilder::MOUNT, $federatedUser, 'circle_id');
-		if ($path !== null) {
-			$qb->limitToMountpoint(CoreQueryBuilder::MOUNT, $path, $forChildren);
+		if (count($paths) !== 0) {
+			$qb->limitToMountpoints(CoreQueryBuilder::MOUNT, $paths, $forChildren);
 		}
 
 		return $this->getItemsFromRequest($qb);

lib/MountManager/CircleMountProvider.php

@@ -253,8 +253,8 @@ private function generateIncrementedMountpoint(Folder $fs, Mount $mount, IFedera
 
 	#[Override]
 	public function getMountsForPath(string $setupPathHint, bool $forChildren, array $mountProviderArgs, IStorageFactory $loader): array {
-		/** @var array<string, Mount[]> $userItems */
-		$userItems = [];
+		/** @var array<string, array{federatedUser: IFederatedUser, paths: string[]}> $userMountRequests */
+		$userMountRequests = [];
 		/** @var array<string, IMountPoint> $mounts */
 		$mounts = [];
 
@@ -267,24 +267,31 @@ public function getMountsForPath(string $setupPathHint, bool $forChildren, array
 				continue;
 			}
 
-			if (!isset($userItems[$user->getUID()])) {
+			if (!isset($userMountRequests[$user->getUID()])) {
 				$federatedUser = $this->federatedUserService->getLocalFederatedUser($user->getUID());
-				$path = '/' . implode('/', array_slice($parts, 3));
-				$userItems[$user->getUID()] = $this->mountRequest->getForUser(
-					$federatedUser,
-					$path,
-					$forChildren
-				);
+				$userMountRequests[$user->getUID()] = [
+					'federatedUser' => $federatedUser,
+					'paths' => [],
+				];
 			}
 
-			foreach ($userItems[$user->getUID()] as $item) {
-				$mountPoint = '/' . $user->getUID() . '/files' . $item->getMountPoint();
+			$userMountRequests[$user->getUID()]['paths'][] = '/' . implode('/', array_slice($parts, 3));
+		}
+
+		foreach ($userMountRequests as $uid => $userMountRequest) {
+			$userItems = $this->mountRequest->getForUser(
+				$userMountRequest['federatedUser'],
+				$userMountRequest['paths'],
+				$forChildren
+			);
+
+			foreach ($userItems as $item) {
+				$mountPoint = '/' . $uid . '/files' . $item->getMountPoint();
 				if (isset($mounts[$mountPoint])) {
 					continue;
 				}
-
 				try {
-					$this->fixDuplicateFile($user->getUID(), $item);
+					$this->fixDuplicateFile($uid, $item);
 					$mounts[$mountPoint] = $this->generateCircleMount($item, $loader);
 				} catch (\Exception $e) {
 					$this->logger->warning('issue with teams\' partial mounts', ['exception' => $e]);