nextcloud / server

lib/private/Files/Config/UserMountCache.php

Indentation +494 added lines, -494 removed lines

@@ -30,498 +30,498 @@
  */
 class UserMountCache implements IUserMountCache {
 
-	/**
-	 * Cached mount info.
-	 * @var CappedMemoryCache<ICachedMountInfo[]>
-	 **/
-	private CappedMemoryCache $mountsForUsers;
-	/**
-	 * fileid => internal path mapping for cached mount info.
-	 * @var CappedMemoryCache<string>
-	 **/
-	private CappedMemoryCache $internalPathCache;
-	/** @var CappedMemoryCache<array> */
-	private CappedMemoryCache $cacheInfoCache;
-
-	/**
-	 * UserMountCache constructor.
-	 */
-	public function __construct(
-		private IDBConnection $connection,
-		private IUserManager $userManager,
-		private LoggerInterface $logger,
-		private IEventLogger $eventLogger,
-		private IEventDispatcher $eventDispatcher,
-	) {
-		$this->cacheInfoCache = new CappedMemoryCache();
-		$this->internalPathCache = new CappedMemoryCache();
-		$this->mountsForUsers = new CappedMemoryCache();
-	}
-
-	public function registerMounts(IUser $user, array $mounts, ?array $mountProviderClasses = null) {
-		$this->eventLogger->start('fs:setup:user:register', 'Registering mounts for user');
-		/** @var array<string, ICachedMountInfo> $newMounts */
-		$newMounts = [];
-		foreach ($mounts as $mount) {
-			// filter out any storages which aren't scanned yet since we aren't interested in files from those storages (yet)
-			if ($mount->getStorageRootId() !== -1) {
-				$mountInfo = new LazyStorageMountInfo($user, $mount);
-				$newMounts[$mountInfo->getKey()] = $mountInfo;
-			}
-		}
-
-		$cachedMounts = $this->getMountsForUser($user);
-		if (is_array($mountProviderClasses)) {
-			$cachedMounts = array_filter($cachedMounts, function (ICachedMountInfo $mountInfo) use ($mountProviderClasses, $newMounts) {
-				// for existing mounts that didn't have a mount provider set
-				// we still want the ones that map to new mounts
-				if ($mountInfo->getMountProvider() === '' && isset($newMounts[$mountInfo->getKey()])) {
-					return true;
-				}
-				return in_array($mountInfo->getMountProvider(), $mountProviderClasses);
-			});
-		}
-
-		$addedMounts = [];
-		$removedMounts = [];
-
-		foreach ($newMounts as $mountKey => $newMount) {
-			if (!isset($cachedMounts[$mountKey])) {
-				$addedMounts[] = $newMount;
-			}
-		}
-
-		foreach ($cachedMounts as $mountKey => $cachedMount) {
-			if (!isset($newMounts[$mountKey])) {
-				$removedMounts[] = $cachedMount;
-			}
-		}
-
-		$changedMounts = $this->findChangedMounts($newMounts, $cachedMounts);
-
-		if ($addedMounts || $removedMounts || $changedMounts) {
-			$this->connection->beginTransaction();
-			$userUID = $user->getUID();
-			try {
-				foreach ($addedMounts as $mount) {
-					$this->logger->debug("Adding mount '{$mount->getKey()}' for user '$userUID'", ['app' => 'files', 'mount_provider' => $mount->getMountProvider()]);
-					$this->addToCache($mount);
-					/** @psalm-suppress InvalidArgument */
-					$this->mountsForUsers[$userUID][$mount->getKey()] = $mount;
-				}
-				foreach ($removedMounts as $mount) {
-					$this->logger->debug("Removing mount '{$mount->getKey()}' for user '$userUID'", ['app' => 'files', 'mount_provider' => $mount->getMountProvider()]);
-					$this->removeFromCache($mount);
-					unset($this->mountsForUsers[$userUID][$mount->getKey()]);
-				}
-				foreach ($changedMounts as $mountPair) {
-					$newMount = $mountPair[1];
-					$this->logger->debug("Updating mount '{$newMount->getKey()}' for user '$userUID'", ['app' => 'files', 'mount_provider' => $newMount->getMountProvider()]);
-					$this->updateCachedMount($newMount);
-					/** @psalm-suppress InvalidArgument */
-					$this->mountsForUsers[$userUID][$newMount->getKey()] = $newMount;
-				}
-				$this->connection->commit();
-			} catch (\Throwable $e) {
-				$this->connection->rollBack();
-				throw $e;
-			}
-
-			// Only fire events after all mounts have already been adjusted in the database.
-			foreach ($addedMounts as $mount) {
-				$this->eventDispatcher->dispatchTyped(new UserMountAddedEvent($mount));
-			}
-			foreach ($removedMounts as $mount) {
-				$this->eventDispatcher->dispatchTyped(new UserMountRemovedEvent($mount));
-			}
-			foreach ($changedMounts as $mountPair) {
-				$this->eventDispatcher->dispatchTyped(new UserMountUpdatedEvent($mountPair[0], $mountPair[1]));
-			}
-		}
-		$this->eventLogger->end('fs:setup:user:register');
-	}
-
-	/**
-	 * @param array<string, ICachedMountInfo> $newMounts
-	 * @param array<string, ICachedMountInfo> $cachedMounts
-	 * @return list<list{0: ICachedMountInfo, 1: ICachedMountInfo}> Pairs of old and new mounts
-	 */
-	private function findChangedMounts(array $newMounts, array $cachedMounts): array {
-		$changed = [];
-		foreach ($cachedMounts as $key => $cachedMount) {
-			if (isset($newMounts[$key])) {
-				$newMount = $newMounts[$key];
-				if (
-					$newMount->getStorageId() !== $cachedMount->getStorageId()
-					|| $newMount->getMountId() !== $cachedMount->getMountId()
-					|| $newMount->getMountProvider() !== $cachedMount->getMountProvider()
-				) {
-					$changed[] = [$cachedMount, $newMount];
-				}
-			}
-		}
-		return $changed;
-	}
-
-	private function addToCache(ICachedMountInfo $mount) {
-		if ($mount->getStorageId() !== -1) {
-			$qb = $this->connection->getQueryBuilder();
-			$qb
-				->insert('mounts')
-				->values([
-					'storage_id' => $qb->createNamedParameter($mount->getStorageId(), IQueryBuilder::PARAM_INT),
-					'root_id' => $qb->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT),
-					'user_id' => $qb->createNamedParameter($mount->getUser()->getUID()),
-					'mount_point' => $qb->createNamedParameter($mount->getMountPoint()),
-					'mount_point_hash' => $qb->createNamedParameter(hash('xxh128', $mount->getMountPoint())),
-					'mount_id' => $qb->createNamedParameter($mount->getMountId(), IQueryBuilder::PARAM_INT),
-					'mount_provider_class' => $qb->createNamedParameter($mount->getMountProvider()),
-				]);
-			try {
-				$qb->executeStatement();
-			} catch (Exception $e) {
-				if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-					throw $e;
-				}
-			}
-		} else {
-			// in some cases this is legitimate, like orphaned shares
-			$this->logger->debug('Could not get storage info for mount at ' . $mount->getMountPoint());
-		}
-	}
-
-	private function updateCachedMount(ICachedMountInfo $mount) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->update('mounts')
-			->set('storage_id', $builder->createNamedParameter($mount->getStorageId()))
-			->set('mount_point', $builder->createNamedParameter($mount->getMountPoint()))
-			->set('mount_point_hash', $builder->createNamedParameter(hash('xxh128', $mount->getMountPoint())))
-			->set('mount_id', $builder->createNamedParameter($mount->getMountId(), IQueryBuilder::PARAM_INT))
-			->set('mount_provider_class', $builder->createNamedParameter($mount->getMountProvider()))
-			->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
-			->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)));
-
-		$query->executeStatement();
-	}
-
-	private function removeFromCache(ICachedMountInfo $mount) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->delete('mounts')
-			->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
-			->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($builder->expr()->eq('mount_point_hash', $builder->createNamedParameter(hash('xxh128', $mount->getMountPoint()))));
-		$query->executeStatement();
-	}
-
-	/**
-	 * @param array $row
-	 * @param (callable(CachedMountInfo): string)|null $pathCallback
-	 * @return CachedMountInfo
-	 */
-	private function dbRowToMountInfo(array $row, ?callable $pathCallback = null): ICachedMountInfo {
-		$user = new LazyUser($row['user_id'], $this->userManager);
-		$mount_id = $row['mount_id'];
-		if (!is_null($mount_id)) {
-			$mount_id = (int)$mount_id;
-		}
-		if ($pathCallback) {
-			return new LazyPathCachedMountInfo(
-				$user,
-				(int)$row['storage_id'],
-				(int)$row['root_id'],
-				$row['mount_point'],
-				$row['mount_provider_class'] ?? '',
-				$mount_id,
-				$pathCallback,
-			);
-		} else {
-			return new CachedMountInfo(
-				$user,
-				(int)$row['storage_id'],
-				(int)$row['root_id'],
-				$row['mount_point'],
-				$row['mount_provider_class'] ?? '',
-				$mount_id,
-				$row['path'] ?? '',
-			);
-		}
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return ICachedMountInfo[]
-	 */
-	public function getMountsForUser(IUser $user) {
-		$userUID = $user->getUID();
-		if (!$this->userManager->userExists($userUID)) {
-			return [];
-		}
-		if (!isset($this->mountsForUsers[$userUID])) {
-			$builder = $this->connection->getQueryBuilder();
-			$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'mount_provider_class')
-				->from('mounts', 'm')
-				->where($builder->expr()->eq('user_id', $builder->createNamedParameter($userUID)));
-
-			$result = $query->executeQuery();
-			$rows = $result->fetchAll();
-			$result->closeCursor();
-
-			/** @var array<string, ICachedMountInfo> $mounts */
-			$mounts = [];
-			foreach ($rows as $row) {
-				$mount = $this->dbRowToMountInfo($row, [$this, 'getInternalPathForMountInfo']);
-				if ($mount !== null) {
-					$mounts[$mount->getKey()] = $mount;
-				}
-			}
-			$this->mountsForUsers[$userUID] = $mounts;
-		}
-		return $this->mountsForUsers[$userUID];
-	}
-
-	public function getInternalPathForMountInfo(CachedMountInfo $info): string {
-		$cached = $this->internalPathCache->get($info->getRootId());
-		if ($cached !== null) {
-			return $cached;
-		}
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select('path')
-			->from('filecache')
-			->where($builder->expr()->eq('fileid', $builder->createNamedParameter($info->getRootId())));
-		return $query->executeQuery()->fetchOne() ?: '';
-	}
-
-	/**
-	 * @param int $numericStorageId
-	 * @param string|null $user limit the results to a single user
-	 * @return CachedMountInfo[]
-	 */
-	public function getMountsForStorageId($numericStorageId, $user = null) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($numericStorageId, IQueryBuilder::PARAM_INT)));
-
-		if ($user) {
-			$query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter($user)));
-		}
-
-		$result = $query->executeQuery();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
-	}
-
-	/**
-	 * @param int $rootFileId
-	 * @return CachedMountInfo[]
-	 */
-	public function getMountsForRootId($rootFileId) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->where($builder->expr()->eq('root_id', $builder->createNamedParameter($rootFileId, IQueryBuilder::PARAM_INT)));
-
-		$result = $query->executeQuery();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
-	}
-
-	/**
-	 * @param $fileId
-	 * @return array{int, string, int}
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	private function getCacheInfoFromFileId($fileId): array {
-		if (!isset($this->cacheInfoCache[$fileId])) {
-			$builder = $this->connection->getQueryBuilder();
-			$query = $builder->select('storage', 'path', 'mimetype')
-				->from('filecache')
-				->where($builder->expr()->eq('fileid', $builder->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
-
-			$result = $query->executeQuery();
-			$row = $result->fetch();
-			$result->closeCursor();
-
-			if (is_array($row)) {
-				$this->cacheInfoCache[$fileId] = [
-					(int)$row['storage'],
-					(string)$row['path'],
-					(int)$row['mimetype']
-				];
-			} else {
-				throw new NotFoundException('File with id "' . $fileId . '" not found');
-			}
-		}
-		return $this->cacheInfoCache[$fileId];
-	}
-
-	/**
-	 * @param int $fileId
-	 * @param string|null $user optionally restrict the results to a single user
-	 * @return ICachedMountFileInfo[]
-	 * @since 9.0.0
-	 */
-	public function getMountsForFileId($fileId, $user = null) {
-		try {
-			[$storageId, $internalPath] = $this->getCacheInfoFromFileId($fileId);
-		} catch (NotFoundException $e) {
-			return [];
-		}
-
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
-			->andWhere(
-				$builder->expr()->orX(
-					$builder->expr()->eq('f.fileid', $builder->createNamedParameter($fileId)),
-					$builder->expr()->emptyString('f.path'),
-					$builder->expr()->eq(
-						$builder->func()->concat('f.path', $builder->createNamedParameter('/')),
-						$builder->func()->substring(
-							$builder->createNamedParameter($internalPath),
-							$builder->createNamedParameter(1, IQueryBuilder::PARAM_INT),
-							$builder->func()->add(
-								$builder->func()->charLength('f.path'),
-								$builder->createNamedParameter(1, IQueryBuilder::PARAM_INT),
-							),
-						),
-					),
-				)
-			);
-
-		if ($user !== null) {
-			$query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter($user)));
-		}
-		$result = $query->executeQuery();
-
-		$mounts = [];
-		while ($row = $result->fetch()) {
-			if ($user === null && !$this->userManager->userExists($row['user_id'])) {
-				continue;
-			}
-
-			$mounts[] = new CachedMountFileInfo(
-				new LazyUser($row['user_id'], $this->userManager),
-				(int)$row['storage_id'],
-				(int)$row['root_id'],
-				$row['mount_point'],
-				$row['mount_id'] === null ? null : (int)$row['mount_id'],
-				$row['mount_provider_class'] ?? '',
-				$row['path'] ?? '',
-				$internalPath,
-			);
-		}
-
-		return $mounts;
-	}
-
-	/**
-	 * Remove all cached mounts for a user
-	 *
-	 * @param IUser $user
-	 */
-	public function removeUserMounts(IUser $user) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->delete('mounts')
-			->where($builder->expr()->eq('user_id', $builder->createNamedParameter($user->getUID())));
-		$query->executeStatement();
-	}
-
-	public function removeUserStorageMount($storageId, $userId) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->delete('mounts')
-			->where($builder->expr()->eq('user_id', $builder->createNamedParameter($userId)))
-			->andWhere($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-	}
-
-	public function remoteStorageMounts($storageId) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->delete('mounts')
-			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-	}
-
-	/**
-	 * @param array $users
-	 * @return array
-	 */
-	public function getUsedSpaceForUsers(array $users) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$mountPointHashes = array_map(static fn (IUser $user) => hash('xxh128', '/' . $user->getUID() . '/'), $users);
-		$userIds = array_map(static fn (IUser $user) => $user->getUID(), $users);
-
-		$query = $builder->select('m.user_id', 'f.size')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f',
-				$builder->expr()->andX(
-					$builder->expr()->eq('m.storage_id', 'f.storage'),
-					$builder->expr()->eq('f.path_hash', $builder->createNamedParameter(md5('files')))
-				))
-			->where($builder->expr()->in('m.mount_point_hash', $builder->createNamedParameter($mountPointHashes, IQueryBuilder::PARAM_STR_ARRAY)))
-			->andWhere($builder->expr()->in('m.user_id', $builder->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
-
-		$result = $query->executeQuery();
-
-		$results = [];
-		while ($row = $result->fetch()) {
-			$results[$row['user_id']] = $row['size'];
-		}
-		$result->closeCursor();
-		return $results;
-	}
-
-	public function clear(): void {
-		$this->cacheInfoCache = new CappedMemoryCache();
-		$this->mountsForUsers = new CappedMemoryCache();
-	}
-
-	public function getMountForPath(IUser $user, string $path): ICachedMountInfo {
-		$mounts = $this->getMountsForUser($user);
-		$mountPoints = array_map(function (ICachedMountInfo $mount) {
-			return $mount->getMountPoint();
-		}, $mounts);
-		$mounts = array_combine($mountPoints, $mounts);
-
-		$current = rtrim($path, '/');
-		// walk up the directory tree until we find a path that has a mountpoint set
-		// the loop will return if a mountpoint is found or break if none are found
-		while (true) {
-			$mountPoint = $current . '/';
-			if (isset($mounts[$mountPoint])) {
-				return $mounts[$mountPoint];
-			} elseif ($current === '') {
-				break;
-			}
-
-			$current = dirname($current);
-			if ($current === '.' || $current === '/') {
-				$current = '';
-			}
-		}
-
-		throw new NotFoundException('No cached mount for path ' . $path);
-	}
-
-	public function getMountsInPath(IUser $user, string $path): array {
-		$path = rtrim($path, '/') . '/';
-		$mounts = $this->getMountsForUser($user);
-		return array_filter($mounts, function (ICachedMountInfo $mount) use ($path) {
-			return $mount->getMountPoint() !== $path && str_starts_with($mount->getMountPoint(), $path);
-		});
-	}
+    /**
+     * Cached mount info.
+     * @var CappedMemoryCache<ICachedMountInfo[]>
+     **/
+    private CappedMemoryCache $mountsForUsers;
+    /**
+     * fileid => internal path mapping for cached mount info.
+     * @var CappedMemoryCache<string>
+     **/
+    private CappedMemoryCache $internalPathCache;
+    /** @var CappedMemoryCache<array> */
+    private CappedMemoryCache $cacheInfoCache;
+
+    /**
+     * UserMountCache constructor.
+     */
+    public function __construct(
+        private IDBConnection $connection,
+        private IUserManager $userManager,
+        private LoggerInterface $logger,
+        private IEventLogger $eventLogger,
+        private IEventDispatcher $eventDispatcher,
+    ) {
+        $this->cacheInfoCache = new CappedMemoryCache();
+        $this->internalPathCache = new CappedMemoryCache();
+        $this->mountsForUsers = new CappedMemoryCache();
+    }
+
+    public function registerMounts(IUser $user, array $mounts, ?array $mountProviderClasses = null) {
+        $this->eventLogger->start('fs:setup:user:register', 'Registering mounts for user');
+        /** @var array<string, ICachedMountInfo> $newMounts */
+        $newMounts = [];
+        foreach ($mounts as $mount) {
+            // filter out any storages which aren't scanned yet since we aren't interested in files from those storages (yet)
+            if ($mount->getStorageRootId() !== -1) {
+                $mountInfo = new LazyStorageMountInfo($user, $mount);
+                $newMounts[$mountInfo->getKey()] = $mountInfo;
+            }
+        }
+
+        $cachedMounts = $this->getMountsForUser($user);
+        if (is_array($mountProviderClasses)) {
+            $cachedMounts = array_filter($cachedMounts, function (ICachedMountInfo $mountInfo) use ($mountProviderClasses, $newMounts) {
+                // for existing mounts that didn't have a mount provider set
+                // we still want the ones that map to new mounts
+                if ($mountInfo->getMountProvider() === '' && isset($newMounts[$mountInfo->getKey()])) {
+                    return true;
+                }
+                return in_array($mountInfo->getMountProvider(), $mountProviderClasses);
+            });
+        }
+
+        $addedMounts = [];
+        $removedMounts = [];
+
+        foreach ($newMounts as $mountKey => $newMount) {
+            if (!isset($cachedMounts[$mountKey])) {
+                $addedMounts[] = $newMount;
+            }
+        }
+
+        foreach ($cachedMounts as $mountKey => $cachedMount) {
+            if (!isset($newMounts[$mountKey])) {
+                $removedMounts[] = $cachedMount;
+            }
+        }
+
+        $changedMounts = $this->findChangedMounts($newMounts, $cachedMounts);
+
+        if ($addedMounts || $removedMounts || $changedMounts) {
+            $this->connection->beginTransaction();
+            $userUID = $user->getUID();
+            try {
+                foreach ($addedMounts as $mount) {
+                    $this->logger->debug("Adding mount '{$mount->getKey()}' for user '$userUID'", ['app' => 'files', 'mount_provider' => $mount->getMountProvider()]);
+                    $this->addToCache($mount);
+                    /** @psalm-suppress InvalidArgument */
+                    $this->mountsForUsers[$userUID][$mount->getKey()] = $mount;
+                }
+                foreach ($removedMounts as $mount) {
+                    $this->logger->debug("Removing mount '{$mount->getKey()}' for user '$userUID'", ['app' => 'files', 'mount_provider' => $mount->getMountProvider()]);
+                    $this->removeFromCache($mount);
+                    unset($this->mountsForUsers[$userUID][$mount->getKey()]);
+                }
+                foreach ($changedMounts as $mountPair) {
+                    $newMount = $mountPair[1];
+                    $this->logger->debug("Updating mount '{$newMount->getKey()}' for user '$userUID'", ['app' => 'files', 'mount_provider' => $newMount->getMountProvider()]);
+                    $this->updateCachedMount($newMount);
+                    /** @psalm-suppress InvalidArgument */
+                    $this->mountsForUsers[$userUID][$newMount->getKey()] = $newMount;
+                }
+                $this->connection->commit();
+            } catch (\Throwable $e) {
+                $this->connection->rollBack();
+                throw $e;
+            }
+
+            // Only fire events after all mounts have already been adjusted in the database.
+            foreach ($addedMounts as $mount) {
+                $this->eventDispatcher->dispatchTyped(new UserMountAddedEvent($mount));
+            }
+            foreach ($removedMounts as $mount) {
+                $this->eventDispatcher->dispatchTyped(new UserMountRemovedEvent($mount));
+            }
+            foreach ($changedMounts as $mountPair) {
+                $this->eventDispatcher->dispatchTyped(new UserMountUpdatedEvent($mountPair[0], $mountPair[1]));
+            }
+        }
+        $this->eventLogger->end('fs:setup:user:register');
+    }
+
+    /**
+     * @param array<string, ICachedMountInfo> $newMounts
+     * @param array<string, ICachedMountInfo> $cachedMounts
+     * @return list<list{0: ICachedMountInfo, 1: ICachedMountInfo}> Pairs of old and new mounts
+     */
+    private function findChangedMounts(array $newMounts, array $cachedMounts): array {
+        $changed = [];
+        foreach ($cachedMounts as $key => $cachedMount) {
+            if (isset($newMounts[$key])) {
+                $newMount = $newMounts[$key];
+                if (
+                    $newMount->getStorageId() !== $cachedMount->getStorageId()
+                    || $newMount->getMountId() !== $cachedMount->getMountId()
+                    || $newMount->getMountProvider() !== $cachedMount->getMountProvider()
+                ) {
+                    $changed[] = [$cachedMount, $newMount];
+                }
+            }
+        }
+        return $changed;
+    }
+
+    private function addToCache(ICachedMountInfo $mount) {
+        if ($mount->getStorageId() !== -1) {
+            $qb = $this->connection->getQueryBuilder();
+            $qb
+                ->insert('mounts')
+                ->values([
+                    'storage_id' => $qb->createNamedParameter($mount->getStorageId(), IQueryBuilder::PARAM_INT),
+                    'root_id' => $qb->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT),
+                    'user_id' => $qb->createNamedParameter($mount->getUser()->getUID()),
+                    'mount_point' => $qb->createNamedParameter($mount->getMountPoint()),
+                    'mount_point_hash' => $qb->createNamedParameter(hash('xxh128', $mount->getMountPoint())),
+                    'mount_id' => $qb->createNamedParameter($mount->getMountId(), IQueryBuilder::PARAM_INT),
+                    'mount_provider_class' => $qb->createNamedParameter($mount->getMountProvider()),
+                ]);
+            try {
+                $qb->executeStatement();
+            } catch (Exception $e) {
+                if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                    throw $e;
+                }
+            }
+        } else {
+            // in some cases this is legitimate, like orphaned shares
+            $this->logger->debug('Could not get storage info for mount at ' . $mount->getMountPoint());
+        }
+    }
+
+    private function updateCachedMount(ICachedMountInfo $mount) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->update('mounts')
+            ->set('storage_id', $builder->createNamedParameter($mount->getStorageId()))
+            ->set('mount_point', $builder->createNamedParameter($mount->getMountPoint()))
+            ->set('mount_point_hash', $builder->createNamedParameter(hash('xxh128', $mount->getMountPoint())))
+            ->set('mount_id', $builder->createNamedParameter($mount->getMountId(), IQueryBuilder::PARAM_INT))
+            ->set('mount_provider_class', $builder->createNamedParameter($mount->getMountProvider()))
+            ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
+            ->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)));
+
+        $query->executeStatement();
+    }
+
+    private function removeFromCache(ICachedMountInfo $mount) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->delete('mounts')
+            ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
+            ->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)))
+            ->andWhere($builder->expr()->eq('mount_point_hash', $builder->createNamedParameter(hash('xxh128', $mount->getMountPoint()))));
+        $query->executeStatement();
+    }
+
+    /**
+     * @param array $row
+     * @param (callable(CachedMountInfo): string)|null $pathCallback
+     * @return CachedMountInfo
+     */
+    private function dbRowToMountInfo(array $row, ?callable $pathCallback = null): ICachedMountInfo {
+        $user = new LazyUser($row['user_id'], $this->userManager);
+        $mount_id = $row['mount_id'];
+        if (!is_null($mount_id)) {
+            $mount_id = (int)$mount_id;
+        }
+        if ($pathCallback) {
+            return new LazyPathCachedMountInfo(
+                $user,
+                (int)$row['storage_id'],
+                (int)$row['root_id'],
+                $row['mount_point'],
+                $row['mount_provider_class'] ?? '',
+                $mount_id,
+                $pathCallback,
+            );
+        } else {
+            return new CachedMountInfo(
+                $user,
+                (int)$row['storage_id'],
+                (int)$row['root_id'],
+                $row['mount_point'],
+                $row['mount_provider_class'] ?? '',
+                $mount_id,
+                $row['path'] ?? '',
+            );
+        }
+    }
+
+    /**
+     * @param IUser $user
+     * @return ICachedMountInfo[]
+     */
+    public function getMountsForUser(IUser $user) {
+        $userUID = $user->getUID();
+        if (!$this->userManager->userExists($userUID)) {
+            return [];
+        }
+        if (!isset($this->mountsForUsers[$userUID])) {
+            $builder = $this->connection->getQueryBuilder();
+            $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'mount_provider_class')
+                ->from('mounts', 'm')
+                ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($userUID)));
+
+            $result = $query->executeQuery();
+            $rows = $result->fetchAll();
+            $result->closeCursor();
+
+            /** @var array<string, ICachedMountInfo> $mounts */
+            $mounts = [];
+            foreach ($rows as $row) {
+                $mount = $this->dbRowToMountInfo($row, [$this, 'getInternalPathForMountInfo']);
+                if ($mount !== null) {
+                    $mounts[$mount->getKey()] = $mount;
+                }
+            }
+            $this->mountsForUsers[$userUID] = $mounts;
+        }
+        return $this->mountsForUsers[$userUID];
+    }
+
+    public function getInternalPathForMountInfo(CachedMountInfo $info): string {
+        $cached = $this->internalPathCache->get($info->getRootId());
+        if ($cached !== null) {
+            return $cached;
+        }
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select('path')
+            ->from('filecache')
+            ->where($builder->expr()->eq('fileid', $builder->createNamedParameter($info->getRootId())));
+        return $query->executeQuery()->fetchOne() ?: '';
+    }
+
+    /**
+     * @param int $numericStorageId
+     * @param string|null $user limit the results to a single user
+     * @return CachedMountInfo[]
+     */
+    public function getMountsForStorageId($numericStorageId, $user = null) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($numericStorageId, IQueryBuilder::PARAM_INT)));
+
+        if ($user) {
+            $query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter($user)));
+        }
+
+        $result = $query->executeQuery();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
+    }
+
+    /**
+     * @param int $rootFileId
+     * @return CachedMountInfo[]
+     */
+    public function getMountsForRootId($rootFileId) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->where($builder->expr()->eq('root_id', $builder->createNamedParameter($rootFileId, IQueryBuilder::PARAM_INT)));
+
+        $result = $query->executeQuery();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
+    }
+
+    /**
+     * @param $fileId
+     * @return array{int, string, int}
+     * @throws \OCP\Files\NotFoundException
+     */
+    private function getCacheInfoFromFileId($fileId): array {
+        if (!isset($this->cacheInfoCache[$fileId])) {
+            $builder = $this->connection->getQueryBuilder();
+            $query = $builder->select('storage', 'path', 'mimetype')
+                ->from('filecache')
+                ->where($builder->expr()->eq('fileid', $builder->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
+
+            $result = $query->executeQuery();
+            $row = $result->fetch();
+            $result->closeCursor();
+
+            if (is_array($row)) {
+                $this->cacheInfoCache[$fileId] = [
+                    (int)$row['storage'],
+                    (string)$row['path'],
+                    (int)$row['mimetype']
+                ];
+            } else {
+                throw new NotFoundException('File with id "' . $fileId . '" not found');
+            }
+        }
+        return $this->cacheInfoCache[$fileId];
+    }
+
+    /**
+     * @param int $fileId
+     * @param string|null $user optionally restrict the results to a single user
+     * @return ICachedMountFileInfo[]
+     * @since 9.0.0
+     */
+    public function getMountsForFileId($fileId, $user = null) {
+        try {
+            [$storageId, $internalPath] = $this->getCacheInfoFromFileId($fileId);
+        } catch (NotFoundException $e) {
+            return [];
+        }
+
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
+            ->andWhere(
+                $builder->expr()->orX(
+                    $builder->expr()->eq('f.fileid', $builder->createNamedParameter($fileId)),
+                    $builder->expr()->emptyString('f.path'),
+                    $builder->expr()->eq(
+                        $builder->func()->concat('f.path', $builder->createNamedParameter('/')),
+                        $builder->func()->substring(
+                            $builder->createNamedParameter($internalPath),
+                            $builder->createNamedParameter(1, IQueryBuilder::PARAM_INT),
+                            $builder->func()->add(
+                                $builder->func()->charLength('f.path'),
+                                $builder->createNamedParameter(1, IQueryBuilder::PARAM_INT),
+                            ),
+                        ),
+                    ),
+                )
+            );
+
+        if ($user !== null) {
+            $query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter($user)));
+        }
+        $result = $query->executeQuery();
+
+        $mounts = [];
+        while ($row = $result->fetch()) {
+            if ($user === null && !$this->userManager->userExists($row['user_id'])) {
+                continue;
+            }
+
+            $mounts[] = new CachedMountFileInfo(
+                new LazyUser($row['user_id'], $this->userManager),
+                (int)$row['storage_id'],
+                (int)$row['root_id'],
+                $row['mount_point'],
+                $row['mount_id'] === null ? null : (int)$row['mount_id'],
+                $row['mount_provider_class'] ?? '',
+                $row['path'] ?? '',
+                $internalPath,
+            );
+        }
+
+        return $mounts;
+    }
+
+    /**
+     * Remove all cached mounts for a user
+     *
+     * @param IUser $user
+     */
+    public function removeUserMounts(IUser $user) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->delete('mounts')
+            ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($user->getUID())));
+        $query->executeStatement();
+    }
+
+    public function removeUserStorageMount($storageId, $userId) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->delete('mounts')
+            ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($userId)))
+            ->andWhere($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+    }
+
+    public function remoteStorageMounts($storageId) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->delete('mounts')
+            ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+    }
+
+    /**
+     * @param array $users
+     * @return array
+     */
+    public function getUsedSpaceForUsers(array $users) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $mountPointHashes = array_map(static fn (IUser $user) => hash('xxh128', '/' . $user->getUID() . '/'), $users);
+        $userIds = array_map(static fn (IUser $user) => $user->getUID(), $users);
+
+        $query = $builder->select('m.user_id', 'f.size')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f',
+                $builder->expr()->andX(
+                    $builder->expr()->eq('m.storage_id', 'f.storage'),
+                    $builder->expr()->eq('f.path_hash', $builder->createNamedParameter(md5('files')))
+                ))
+            ->where($builder->expr()->in('m.mount_point_hash', $builder->createNamedParameter($mountPointHashes, IQueryBuilder::PARAM_STR_ARRAY)))
+            ->andWhere($builder->expr()->in('m.user_id', $builder->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
+
+        $result = $query->executeQuery();
+
+        $results = [];
+        while ($row = $result->fetch()) {
+            $results[$row['user_id']] = $row['size'];
+        }
+        $result->closeCursor();
+        return $results;
+    }
+
+    public function clear(): void {
+        $this->cacheInfoCache = new CappedMemoryCache();
+        $this->mountsForUsers = new CappedMemoryCache();
+    }
+
+    public function getMountForPath(IUser $user, string $path): ICachedMountInfo {
+        $mounts = $this->getMountsForUser($user);
+        $mountPoints = array_map(function (ICachedMountInfo $mount) {
+            return $mount->getMountPoint();
+        }, $mounts);
+        $mounts = array_combine($mountPoints, $mounts);
+
+        $current = rtrim($path, '/');
+        // walk up the directory tree until we find a path that has a mountpoint set
+        // the loop will return if a mountpoint is found or break if none are found
+        while (true) {
+            $mountPoint = $current . '/';
+            if (isset($mounts[$mountPoint])) {
+                return $mounts[$mountPoint];
+            } elseif ($current === '') {
+                break;
+            }
+
+            $current = dirname($current);
+            if ($current === '.' || $current === '/') {
+                $current = '';
+            }
+        }
+
+        throw new NotFoundException('No cached mount for path ' . $path);
+    }
+
+    public function getMountsInPath(IUser $user, string $path): array {
+        $path = rtrim($path, '/') . '/';
+        $mounts = $this->getMountsForUser($user);
+        return array_filter($mounts, function (ICachedMountInfo $mount) use ($path) {
+            return $mount->getMountPoint() !== $path && str_starts_with($mount->getMountPoint(), $path);
+        });
+    }
 }

tests/lib/Files/Cache/FileAccessTest.php

Indentation +429 added lines, -429 removed lines

@@ -21,433 +21,433 @@
 
 #[\PHPUnit\Framework\Attributes\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'),
-				'mount_point_hash' => $queryBuilder->createNamedParameter(hash('xxh128', '/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'),
-				'mount_point_hash' => $queryBuilder->createNamedParameter(hash('xxh128', '/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'),
-				'mount_point_hash' => $queryBuilder->createNamedParameter(hash('xxh128', '/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'),
-				'mount_point_hash' => $queryBuilder->createNamedParameter(hash('xxh128', '/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'),
-				'mount_point_hash' => $queryBuilder->createNamedParameter(hash('xxh128', '/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'),
+                'mount_point_hash' => $queryBuilder->createNamedParameter(hash('xxh128', '/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'),
+                'mount_point_hash' => $queryBuilder->createNamedParameter(hash('xxh128', '/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'),
+                'mount_point_hash' => $queryBuilder->createNamedParameter(hash('xxh128', '/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'),
+                'mount_point_hash' => $queryBuilder->createNamedParameter(hash('xxh128', '/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'),
+                'mount_point_hash' => $queryBuilder->createNamedParameter(hash('xxh128', '/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());
+    }
 }

tests/lib/DB/QueryBuilder/Partitioned/PartitionedQueryBuilderTest.php

Indentation +208 added lines, -208 removed lines

@@ -20,212 +20,212 @@
 
 #[\PHPUnit\Framework\Attributes\Group('DB')]
 class PartitionedQueryBuilderTest extends TestCase {
-	private IDBConnection $connection;
-	private ShardConnectionManager $shardConnectionManager;
-	private AutoIncrementHandler $autoIncrementHandler;
-
-	protected function setUp(): void {
-		if (PHP_INT_SIZE < 8) {
-			$this->markTestSkipped('Test requires 64bit');
-			return;
-		}
-		$this->connection = Server::get(IDBConnection::class);
-		$this->shardConnectionManager = Server::get(ShardConnectionManager::class);
-		$this->autoIncrementHandler = Server::get(AutoIncrementHandler::class);
-
-		$this->setupFileCache();
-	}
-
-	protected function tearDown(): void {
-		// PHP unit also runs tearDown when the test is skipped, but we only initialized when using 64bit
-		// see https://github.com/sebastianbergmann/phpunit/issues/6394
-		if (PHP_INT_SIZE >= 8) {
-			$this->cleanupDb();
-		}
-		parent::tearDown();
-	}
-
-
-	private function getQueryBuilder(): PartitionedQueryBuilder {
-		$builder = $this->connection->getQueryBuilder();
-		if ($builder instanceof PartitionedQueryBuilder) {
-			return $builder;
-		} else {
-			return new PartitionedQueryBuilder($builder, [], $this->shardConnectionManager, $this->autoIncrementHandler);
-		}
-	}
-
-	private function setupFileCache(): void {
-		$this->cleanupDb();
-		$query = $this->getQueryBuilder();
-		$query->insert('storages')
-			->values([
-				'numeric_id' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
-				'id' => $query->createNamedParameter('test1'),
-			]);
-		$query->executeStatement();
-
-		$query = $this->getQueryBuilder();
-		$query->insert('filecache')
-			->values([
-				'storage' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
-				'path' => $query->createNamedParameter('file1'),
-				'path_hash' => $query->createNamedParameter(md5('file1')),
-			]);
-		$query->executeStatement();
-		$fileId = $query->getLastInsertId();
-
-		$query = $this->getQueryBuilder();
-		$query->insert('filecache_extended')
-			->hintShardKey('storage', 1001001)
-			->values([
-				'fileid' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
-				'upload_time' => $query->createNamedParameter(1234, IQueryBuilder::PARAM_INT),
-			]);
-		$query->executeStatement();
-
-		$query = $this->getQueryBuilder();
-		$query->insert('mounts')
-			->values([
-				'storage_id' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
-				'user_id' => $query->createNamedParameter('partitioned_test'),
-				'mount_point' => $query->createNamedParameter('/mount/point'),
-				'mount_point_hash' => $query->createNamedParameter(hash('xxh128', '/mount/point')),
-				'mount_provider_class' => $query->createNamedParameter('test'),
-				'root_id' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
-			]);
-		$query->executeStatement();
-	}
-
-	private function cleanupDb(): void {
-		$query = $this->getQueryBuilder();
-		$query->delete('storages')
-			->where($query->expr()->gt('numeric_id', $query->createNamedParameter(1000000, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-
-		$query = $this->getQueryBuilder();
-		$query->delete('filecache')
-			->where($query->expr()->gt('storage', $query->createNamedParameter(1000000, IQueryBuilder::PARAM_INT)))
-			->runAcrossAllShards();
-		$query->executeStatement();
-
-		$query = $this->getQueryBuilder();
-		$query->delete('filecache_extended')
-			->runAcrossAllShards();
-		$query->executeStatement();
-
-		$query = $this->getQueryBuilder();
-		$query->delete('mounts')
-			->where($query->expr()->like('user_id', $query->createNamedParameter('partitioned_%')));
-		$query->executeStatement();
-	}
-
-	public function testSimpleOnlyPartitionQuery(): void {
-		$builder = $this->getQueryBuilder();
-		$builder->addPartition(new PartitionSplit('filecache', ['filecache']));
-
-		// query borrowed from UserMountCache
-		$query = $builder->select('path')
-			->from('filecache')
-			->where($builder->expr()->eq('storage', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
-
-		$results = $query->executeQuery()->fetchAll();
-		$this->assertCount(1, $results);
-		$this->assertEquals($results[0]['path'], 'file1');
-	}
-
-	public function testSimplePartitionedQuery(): void {
-		$builder = $this->getQueryBuilder();
-		$builder->addPartition(new PartitionSplit('filecache', ['filecache']));
-
-		// query borrowed from UserMountCache
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_point_hash', 'mount_id', 'f.path', 'mount_provider_class')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
-
-		$query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
-
-		$this->assertEquals(2, $query->getPartitionCount());
-
-		$results = $query->executeQuery()->fetchAll();
-		$this->assertCount(1, $results);
-		$this->assertEquals($results[0]['user_id'], 'partitioned_test');
-		$this->assertEquals($results[0]['mount_point'], '/mount/point');
-		$this->assertEquals($results[0]['mount_point_hash'], hash('xxh128', '/mount/point'));
-		$this->assertEquals($results[0]['mount_provider_class'], 'test');
-		$this->assertEquals($results[0]['path'], 'file1');
-	}
-
-	public function testMultiTablePartitionedQuery(): void {
-		$builder = $this->getQueryBuilder();
-		$builder->addPartition(new PartitionSplit('filecache', ['filecache', 'filecache_extended']));
-
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_point_hash', 'mount_id', 'f.path', 'mount_provider_class', 'fe.upload_time')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->innerJoin('f', 'filecache_extended', 'fe', $builder->expr()->eq('f.fileid', 'fe.fileid'))
-			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
-
-		$query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
-
-		$this->assertEquals(2, $query->getPartitionCount());
-
-		$results = $query->executeQuery()->fetchAll();
-		$this->assertCount(1, $results);
-		$this->assertEquals($results[0]['user_id'], 'partitioned_test');
-		$this->assertEquals($results[0]['mount_point'], '/mount/point');
-		$this->assertEquals($results[0]['mount_point_hash'], hash('xxh128', '/mount/point'));
-		$this->assertEquals($results[0]['mount_provider_class'], 'test');
-		$this->assertEquals($results[0]['path'], 'file1');
-		$this->assertEquals($results[0]['upload_time'], 1234);
-	}
-
-	public function testPartitionedQueryFromSplit(): void {
-		$builder = $this->getQueryBuilder();
-		$builder->addPartition(new PartitionSplit('filecache', ['filecache']));
-
-		$query = $builder->select('storage', 'm.root_id', 'm.user_id', 'm.mount_point', 'm.mount_point_hash', 'm.mount_id', 'path', 'm.mount_provider_class')
-			->from('filecache', 'f')
-			->innerJoin('f', 'mounts', 'm', $builder->expr()->eq('m.root_id', 'f.fileid'));
-		$query->where($builder->expr()->eq('storage', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
-
-		$query->andWhere($builder->expr()->eq('m.user_id', $builder->createNamedParameter('partitioned_test')));
-
-		$this->assertEquals(2, $query->getPartitionCount());
-
-		$results = $query->executeQuery()->fetchAll();
-		$this->assertCount(1, $results);
-		$this->assertEquals($results[0]['user_id'], 'partitioned_test');
-		$this->assertEquals($results[0]['mount_point'], '/mount/point');
-		$this->assertEquals($results[0]['mount_point_hash'], hash('xxh128', '/mount/point'));
-		$this->assertEquals($results[0]['mount_provider_class'], 'test');
-		$this->assertEquals($results[0]['path'], 'file1');
-	}
-
-	public function testMultiJoinPartitionedQuery(): void {
-		$builder = $this->getQueryBuilder();
-		$builder->addPartition(new PartitionSplit('filecache', ['filecache']));
-
-		// query borrowed from UserMountCache
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_point_hash', 'mount_id', 'f.path', 'mount_provider_class')
-			->selectAlias('s.id', 'storage_string_id')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->innerJoin('f', 'storages', 's', $builder->expr()->eq('f.storage', 's.numeric_id'))
-			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
-
-		$query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
-
-		$this->assertEquals(3, $query->getPartitionCount());
-
-		$results = $query->executeQuery()->fetchAll();
-		$this->assertCount(1, $results);
-		$this->assertEquals($results[0]['user_id'], 'partitioned_test');
-		$this->assertEquals($results[0]['mount_point'], '/mount/point');
-		$this->assertEquals($results[0]['mount_point_hash'], hash('xxh128', '/mount/point'));
-		$this->assertEquals($results[0]['mount_provider_class'], 'test');
-		$this->assertEquals($results[0]['path'], 'file1');
-		$this->assertEquals($results[0]['storage_string_id'], 'test1');
-	}
+    private IDBConnection $connection;
+    private ShardConnectionManager $shardConnectionManager;
+    private AutoIncrementHandler $autoIncrementHandler;
+
+    protected function setUp(): void {
+        if (PHP_INT_SIZE < 8) {
+            $this->markTestSkipped('Test requires 64bit');
+            return;
+        }
+        $this->connection = Server::get(IDBConnection::class);
+        $this->shardConnectionManager = Server::get(ShardConnectionManager::class);
+        $this->autoIncrementHandler = Server::get(AutoIncrementHandler::class);
+
+        $this->setupFileCache();
+    }
+
+    protected function tearDown(): void {
+        // PHP unit also runs tearDown when the test is skipped, but we only initialized when using 64bit
+        // see https://github.com/sebastianbergmann/phpunit/issues/6394
+        if (PHP_INT_SIZE >= 8) {
+            $this->cleanupDb();
+        }
+        parent::tearDown();
+    }
+
+
+    private function getQueryBuilder(): PartitionedQueryBuilder {
+        $builder = $this->connection->getQueryBuilder();
+        if ($builder instanceof PartitionedQueryBuilder) {
+            return $builder;
+        } else {
+            return new PartitionedQueryBuilder($builder, [], $this->shardConnectionManager, $this->autoIncrementHandler);
+        }
+    }
+
+    private function setupFileCache(): void {
+        $this->cleanupDb();
+        $query = $this->getQueryBuilder();
+        $query->insert('storages')
+            ->values([
+                'numeric_id' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
+                'id' => $query->createNamedParameter('test1'),
+            ]);
+        $query->executeStatement();
+
+        $query = $this->getQueryBuilder();
+        $query->insert('filecache')
+            ->values([
+                'storage' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
+                'path' => $query->createNamedParameter('file1'),
+                'path_hash' => $query->createNamedParameter(md5('file1')),
+            ]);
+        $query->executeStatement();
+        $fileId = $query->getLastInsertId();
+
+        $query = $this->getQueryBuilder();
+        $query->insert('filecache_extended')
+            ->hintShardKey('storage', 1001001)
+            ->values([
+                'fileid' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
+                'upload_time' => $query->createNamedParameter(1234, IQueryBuilder::PARAM_INT),
+            ]);
+        $query->executeStatement();
+
+        $query = $this->getQueryBuilder();
+        $query->insert('mounts')
+            ->values([
+                'storage_id' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
+                'user_id' => $query->createNamedParameter('partitioned_test'),
+                'mount_point' => $query->createNamedParameter('/mount/point'),
+                'mount_point_hash' => $query->createNamedParameter(hash('xxh128', '/mount/point')),
+                'mount_provider_class' => $query->createNamedParameter('test'),
+                'root_id' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
+            ]);
+        $query->executeStatement();
+    }
+
+    private function cleanupDb(): void {
+        $query = $this->getQueryBuilder();
+        $query->delete('storages')
+            ->where($query->expr()->gt('numeric_id', $query->createNamedParameter(1000000, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+
+        $query = $this->getQueryBuilder();
+        $query->delete('filecache')
+            ->where($query->expr()->gt('storage', $query->createNamedParameter(1000000, IQueryBuilder::PARAM_INT)))
+            ->runAcrossAllShards();
+        $query->executeStatement();
+
+        $query = $this->getQueryBuilder();
+        $query->delete('filecache_extended')
+            ->runAcrossAllShards();
+        $query->executeStatement();
+
+        $query = $this->getQueryBuilder();
+        $query->delete('mounts')
+            ->where($query->expr()->like('user_id', $query->createNamedParameter('partitioned_%')));
+        $query->executeStatement();
+    }
+
+    public function testSimpleOnlyPartitionQuery(): void {
+        $builder = $this->getQueryBuilder();
+        $builder->addPartition(new PartitionSplit('filecache', ['filecache']));
+
+        // query borrowed from UserMountCache
+        $query = $builder->select('path')
+            ->from('filecache')
+            ->where($builder->expr()->eq('storage', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
+
+        $results = $query->executeQuery()->fetchAll();
+        $this->assertCount(1, $results);
+        $this->assertEquals($results[0]['path'], 'file1');
+    }
+
+    public function testSimplePartitionedQuery(): void {
+        $builder = $this->getQueryBuilder();
+        $builder->addPartition(new PartitionSplit('filecache', ['filecache']));
+
+        // query borrowed from UserMountCache
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_point_hash', 'mount_id', 'f.path', 'mount_provider_class')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
+
+        $query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
+
+        $this->assertEquals(2, $query->getPartitionCount());
+
+        $results = $query->executeQuery()->fetchAll();
+        $this->assertCount(1, $results);
+        $this->assertEquals($results[0]['user_id'], 'partitioned_test');
+        $this->assertEquals($results[0]['mount_point'], '/mount/point');
+        $this->assertEquals($results[0]['mount_point_hash'], hash('xxh128', '/mount/point'));
+        $this->assertEquals($results[0]['mount_provider_class'], 'test');
+        $this->assertEquals($results[0]['path'], 'file1');
+    }
+
+    public function testMultiTablePartitionedQuery(): void {
+        $builder = $this->getQueryBuilder();
+        $builder->addPartition(new PartitionSplit('filecache', ['filecache', 'filecache_extended']));
+
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_point_hash', 'mount_id', 'f.path', 'mount_provider_class', 'fe.upload_time')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->innerJoin('f', 'filecache_extended', 'fe', $builder->expr()->eq('f.fileid', 'fe.fileid'))
+            ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
+
+        $query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
+
+        $this->assertEquals(2, $query->getPartitionCount());
+
+        $results = $query->executeQuery()->fetchAll();
+        $this->assertCount(1, $results);
+        $this->assertEquals($results[0]['user_id'], 'partitioned_test');
+        $this->assertEquals($results[0]['mount_point'], '/mount/point');
+        $this->assertEquals($results[0]['mount_point_hash'], hash('xxh128', '/mount/point'));
+        $this->assertEquals($results[0]['mount_provider_class'], 'test');
+        $this->assertEquals($results[0]['path'], 'file1');
+        $this->assertEquals($results[0]['upload_time'], 1234);
+    }
+
+    public function testPartitionedQueryFromSplit(): void {
+        $builder = $this->getQueryBuilder();
+        $builder->addPartition(new PartitionSplit('filecache', ['filecache']));
+
+        $query = $builder->select('storage', 'm.root_id', 'm.user_id', 'm.mount_point', 'm.mount_point_hash', 'm.mount_id', 'path', 'm.mount_provider_class')
+            ->from('filecache', 'f')
+            ->innerJoin('f', 'mounts', 'm', $builder->expr()->eq('m.root_id', 'f.fileid'));
+        $query->where($builder->expr()->eq('storage', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
+
+        $query->andWhere($builder->expr()->eq('m.user_id', $builder->createNamedParameter('partitioned_test')));
+
+        $this->assertEquals(2, $query->getPartitionCount());
+
+        $results = $query->executeQuery()->fetchAll();
+        $this->assertCount(1, $results);
+        $this->assertEquals($results[0]['user_id'], 'partitioned_test');
+        $this->assertEquals($results[0]['mount_point'], '/mount/point');
+        $this->assertEquals($results[0]['mount_point_hash'], hash('xxh128', '/mount/point'));
+        $this->assertEquals($results[0]['mount_provider_class'], 'test');
+        $this->assertEquals($results[0]['path'], 'file1');
+    }
+
+    public function testMultiJoinPartitionedQuery(): void {
+        $builder = $this->getQueryBuilder();
+        $builder->addPartition(new PartitionSplit('filecache', ['filecache']));
+
+        // query borrowed from UserMountCache
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_point_hash', 'mount_id', 'f.path', 'mount_provider_class')
+            ->selectAlias('s.id', 'storage_string_id')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->innerJoin('f', 'storages', 's', $builder->expr()->eq('f.storage', 's.numeric_id'))
+            ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
+
+        $query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
+
+        $this->assertEquals(3, $query->getPartitionCount());
+
+        $results = $query->executeQuery()->fetchAll();
+        $this->assertCount(1, $results);
+        $this->assertEquals($results[0]['user_id'], 'partitioned_test');
+        $this->assertEquals($results[0]['mount_point'], '/mount/point');
+        $this->assertEquals($results[0]['mount_point_hash'], hash('xxh128', '/mount/point'));
+        $this->assertEquals($results[0]['mount_provider_class'], 'test');
+        $this->assertEquals($results[0]['path'], 'file1');
+        $this->assertEquals($results[0]['storage_string_id'], 'test1');
+    }
 }

core/Migrations/Version33000Date20251209123503.php

Indentation +28 added lines, -28 removed lines

@@ -18,32 +18,32 @@
 use Override;
 
 class Version33000Date20251209123503 extends SimpleMigrationStep {
-	public function __construct(
-		private readonly IDBConnection $connection,
-	) {
-	}
-
-	#[Override]
-	public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
-		$this->connection->truncateTable('mounts', false);
-	}
-
-	#[Override]
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		$table = $schema->getTable('mounts');
-		if (!$table->hasColumn('mount_point_hash')) {
-			$table->addColumn('mount_point_hash', Types::STRING, [
-				'notnull' => true,
-				'length' => 32, // xxh128
-			]);
-			$table->dropIndex('mounts_user_root_path_index');
-			$table->addUniqueIndex(['user_id', 'root_id', 'mount_point_hash'], 'mounts_user_root_path_index');
-			return $schema;
-		}
-
-		return null;
-	}
+    public function __construct(
+        private readonly IDBConnection $connection,
+    ) {
+    }
+
+    #[Override]
+    public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+        $this->connection->truncateTable('mounts', false);
+    }
+
+    #[Override]
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        $table = $schema->getTable('mounts');
+        if (!$table->hasColumn('mount_point_hash')) {
+            $table->addColumn('mount_point_hash', Types::STRING, [
+                'notnull' => true,
+                'length' => 32, // xxh128
+            ]);
+            $table->dropIndex('mounts_user_root_path_index');
+            $table->addUniqueIndex(['user_id', 'root_id', 'mount_point_hash'], 'mounts_user_root_path_index');
+            return $schema;
+        }
+
+        return null;
+    }
 }

core/Listener/AddMissingIndicesListener.php

Indentation +193 added lines, -193 removed lines

@@ -18,197 +18,197 @@
  */
 class AddMissingIndicesListener implements IEventListener {
 
-	public function handle(Event $event): void {
-		if (!($event instanceof AddMissingIndicesEvent)) {
-			return;
-		}
-
-		$event->addMissingIndex(
-			'share',
-			'share_with_index',
-			['share_with']
-		);
-		$event->addMissingIndex(
-			'share',
-			'parent_index',
-			['parent']
-		);
-		$event->addMissingIndex(
-			'share',
-			'owner_index',
-			['uid_owner']
-		);
-		$event->addMissingIndex(
-			'share',
-			'initiator_index',
-			['uid_initiator']
-		);
-
-		$event->addMissingIndex(
-			'filecache',
-			'fs_mtime',
-			['mtime']
-		);
-		$event->addMissingIndex(
-			'filecache',
-			'fs_size',
-			['size']
-		);
-		$event->addMissingIndex(
-			'filecache',
-			'fs_storage_path_prefix',
-			['storage', 'path'],
-			['lengths' => [null, 64]]
-		);
-		$event->addMissingIndex(
-			'filecache',
-			'fs_parent',
-			['parent']
-		);
-		$event->addMissingIndex(
-			'filecache',
-			'fs_name_hash',
-			['name']
-		);
-
-		$event->addMissingIndex(
-			'twofactor_providers',
-			'twofactor_providers_uid',
-			['uid']
-		);
-
-		$event->addMissingUniqueIndex(
-			'login_flow_v2',
-			'poll_token',
-			['poll_token'],
-			[],
-			true
-		);
-		$event->addMissingUniqueIndex(
-			'login_flow_v2',
-			'login_token',
-			['login_token'],
-			[],
-			true
-		);
-		$event->addMissingIndex(
-			'login_flow_v2',
-			'timestamp',
-			['timestamp'],
-			[],
-			true
-		);
-
-		$event->addMissingIndex(
-			'whats_new',
-			'version',
-			['version'],
-			[],
-			true
-		);
-
-		$event->addMissingIndex(
-			'cards',
-			'cards_abiduri',
-			['addressbookid', 'uri'],
-			[],
-			true
-		);
-
-		$event->replaceIndex(
-			'cards_properties',
-			['cards_prop_abid'],
-			'cards_prop_abid_name_value',
-			['addressbookid', 'name', 'value'],
-			false,
-		);
-
-		$event->addMissingIndex(
-			'calendarobjects_props',
-			'calendarobject_calid_index',
-			['calendarid', 'calendartype']
-		);
-
-		$event->addMissingIndex(
-			'schedulingobjects',
-			'schedulobj_principuri_index',
-			['principaluri']
-		);
-
-		$event->addMissingIndex(
-			'schedulingobjects',
-			'schedulobj_lastmodified_idx',
-			['lastmodified']
-		);
-
-		$event->addMissingIndex(
-			'properties',
-			'properties_path_index',
-			['userid', 'propertypath']
-		);
-		$event->addMissingIndex(
-			'properties',
-			'properties_pathonly_index',
-			['propertypath']
-		);
-		$event->addMissingIndex(
-			'properties',
-			'properties_name_path_user',
-			['propertyname', 'propertypath', 'userid']
-		);
-
-
-		$event->addMissingIndex(
-			'jobs',
-			'job_lastcheck_reserved',
-			['last_checked', 'reserved_at']
-		);
-
-		$event->addMissingIndex(
-			'direct_edit',
-			'direct_edit_timestamp',
-			['timestamp']
-		);
-
-		$event->addMissingIndex(
-			'preferences',
-			'prefs_uid_lazy_i',
-			['userid', 'lazy']
-		);
-		$event->addMissingIndex(
-			'preferences',
-			'prefs_app_key_ind_fl_i',
-			['appid', 'configkey', 'indexed', 'flags']
-		);
-
-		$event->addMissingIndex(
-			'mounts',
-			'mounts_class_index',
-			['mount_provider_class']
-		);
-
-		$event->addMissingIndex(
-			'systemtag_object_mapping',
-			'systag_by_tagid',
-			['systemtagid', 'objecttype']
-		);
-
-		$event->addMissingIndex(
-			'systemtag_object_mapping',
-			'systag_by_objectid',
-			['objectid']
-		);
-
-		$event->addMissingIndex(
-			'systemtag_object_mapping',
-			'systag_objecttype',
-			['objecttype']
-		);
-
-		$event->addMissingUniqueIndex(
-			'vcategory',
-			'unique_category_per_user',
-			['uid', 'type', 'category']
-		);
-	}
+    public function handle(Event $event): void {
+        if (!($event instanceof AddMissingIndicesEvent)) {
+            return;
+        }
+
+        $event->addMissingIndex(
+            'share',
+            'share_with_index',
+            ['share_with']
+        );
+        $event->addMissingIndex(
+            'share',
+            'parent_index',
+            ['parent']
+        );
+        $event->addMissingIndex(
+            'share',
+            'owner_index',
+            ['uid_owner']
+        );
+        $event->addMissingIndex(
+            'share',
+            'initiator_index',
+            ['uid_initiator']
+        );
+
+        $event->addMissingIndex(
+            'filecache',
+            'fs_mtime',
+            ['mtime']
+        );
+        $event->addMissingIndex(
+            'filecache',
+            'fs_size',
+            ['size']
+        );
+        $event->addMissingIndex(
+            'filecache',
+            'fs_storage_path_prefix',
+            ['storage', 'path'],
+            ['lengths' => [null, 64]]
+        );
+        $event->addMissingIndex(
+            'filecache',
+            'fs_parent',
+            ['parent']
+        );
+        $event->addMissingIndex(
+            'filecache',
+            'fs_name_hash',
+            ['name']
+        );
+
+        $event->addMissingIndex(
+            'twofactor_providers',
+            'twofactor_providers_uid',
+            ['uid']
+        );
+
+        $event->addMissingUniqueIndex(
+            'login_flow_v2',
+            'poll_token',
+            ['poll_token'],
+            [],
+            true
+        );
+        $event->addMissingUniqueIndex(
+            'login_flow_v2',
+            'login_token',
+            ['login_token'],
+            [],
+            true
+        );
+        $event->addMissingIndex(
+            'login_flow_v2',
+            'timestamp',
+            ['timestamp'],
+            [],
+            true
+        );
+
+        $event->addMissingIndex(
+            'whats_new',
+            'version',
+            ['version'],
+            [],
+            true
+        );
+
+        $event->addMissingIndex(
+            'cards',
+            'cards_abiduri',
+            ['addressbookid', 'uri'],
+            [],
+            true
+        );
+
+        $event->replaceIndex(
+            'cards_properties',
+            ['cards_prop_abid'],
+            'cards_prop_abid_name_value',
+            ['addressbookid', 'name', 'value'],
+            false,
+        );
+
+        $event->addMissingIndex(
+            'calendarobjects_props',
+            'calendarobject_calid_index',
+            ['calendarid', 'calendartype']
+        );
+
+        $event->addMissingIndex(
+            'schedulingobjects',
+            'schedulobj_principuri_index',
+            ['principaluri']
+        );
+
+        $event->addMissingIndex(
+            'schedulingobjects',
+            'schedulobj_lastmodified_idx',
+            ['lastmodified']
+        );
+
+        $event->addMissingIndex(
+            'properties',
+            'properties_path_index',
+            ['userid', 'propertypath']
+        );
+        $event->addMissingIndex(
+            'properties',
+            'properties_pathonly_index',
+            ['propertypath']
+        );
+        $event->addMissingIndex(
+            'properties',
+            'properties_name_path_user',
+            ['propertyname', 'propertypath', 'userid']
+        );
+
+
+        $event->addMissingIndex(
+            'jobs',
+            'job_lastcheck_reserved',
+            ['last_checked', 'reserved_at']
+        );
+
+        $event->addMissingIndex(
+            'direct_edit',
+            'direct_edit_timestamp',
+            ['timestamp']
+        );
+
+        $event->addMissingIndex(
+            'preferences',
+            'prefs_uid_lazy_i',
+            ['userid', 'lazy']
+        );
+        $event->addMissingIndex(
+            'preferences',
+            'prefs_app_key_ind_fl_i',
+            ['appid', 'configkey', 'indexed', 'flags']
+        );
+
+        $event->addMissingIndex(
+            'mounts',
+            'mounts_class_index',
+            ['mount_provider_class']
+        );
+
+        $event->addMissingIndex(
+            'systemtag_object_mapping',
+            'systag_by_tagid',
+            ['systemtagid', 'objecttype']
+        );
+
+        $event->addMissingIndex(
+            'systemtag_object_mapping',
+            'systag_by_objectid',
+            ['objectid']
+        );
+
+        $event->addMissingIndex(
+            'systemtag_object_mapping',
+            'systag_objecttype',
+            ['objecttype']
+        );
+
+        $event->addMissingUniqueIndex(
+            'vcategory',
+            'unique_category_per_user',
+            ['uid', 'type', 'category']
+        );
+    }
 }