fix: make mount point name compatible with sharding by switching it to the list of root ids

Signed-off-by: Robin Appelman <robin@icewind.nl>

Author: icewind1991

lib/private/Files/Cache/QuerySearchHelper.php

@@ -10,13 +10,17 @@
 use OC\Files\Cache\Wrapper\CacheJail;
 use OC\Files\Search\QueryOptimizer\QueryOptimizer;
 use OC\Files\Search\SearchBinaryOperator;
+use OC\Files\Search\SearchComparison;
+use OC\Files\Search\SearchQuery;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\Files\Cache\ICache;
 use OCP\Files\Cache\ICacheEntry;
 use OCP\Files\IMimeTypeLoader;
 use OCP\Files\IRootFolder;
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\Search\ISearchBinaryOperator;
+use OCP\Files\Search\ISearchComparison;
+use OCP\Files\Search\ISearchOperator;
 use OCP\Files\Search\ISearchQuery;
 use OCP\FilesMetadata\IFilesMetadataManager;
 use OCP\FilesMetadata\IMetadataQuery;
@@ -95,7 +99,7 @@ public function findUsedTagsInCaches(ISearchQuery $searchQuery, array $caches):
 	protected function equipQueryForSystemTags(CacheQueryBuilder $query, IUser $user): void {
 		$query->leftJoin('file', 'systemtag_object_mapping', 'systemtagmap', $query->expr()->andX(
 			$query->expr()->eq('file.fileid', $query->expr()->castColumn('systemtagmap.objectid', IQueryBuilder::PARAM_INT)),
-			$query->expr()->eq('systemtagmap.objecttype', $query->createNamedParameter('files'))
+			$query->expr()->eq('systemtagmap.objecttype', $query->createNamedParameter('files')),
 		));
 		$on = $query->expr()->andX($query->expr()->eq('systemtag.id', 'systemtagmap.systemtagid'));
 		if (!$this->groupManager->isAdmin($user->getUID())) {
@@ -110,15 +114,15 @@ protected function equipQueryForDavTags(CacheQueryBuilder $query, IUser $user):
 			->leftJoin('tagmap', 'vcategory', 'tag', $query->expr()->andX(
 				$query->expr()->eq('tagmap.categoryid', 'tag.id'),
 				$query->expr()->eq('tag.type', $query->createNamedParameter('files')),
-				$query->expr()->eq('tag.uid', $query->createNamedParameter($user->getUID()))
+				$query->expr()->eq('tag.uid', $query->createNamedParameter($user->getUID())),
 			));
 	}
 
 	protected function equipQueryForMounts(CacheQueryBuilder $query, IUser $user): void {
 		$query
 			->leftJoin('file', 'mounts', 'm', $query->expr()->andX(
 				$query->expr()->eq('m.root_id', 'file.fileid'),
-				$query->expr()->eq('m.user_id', $query->createNamedParameter($user->getUID()))
+				$query->expr()->eq('m.user_id', $query->createNamedParameter($user->getUID())),
 			));
 	}
 
@@ -152,6 +156,8 @@ public function searchInCaches(ISearchQuery $searchQuery, array $caches): array
 		// while the resulting rows don't have a way to tell what storage they came from (multiple storages/caches can share storage_id)
 		// we can just ask every cache if the row belongs to them and give them the cache to do any post processing on the result.
 
+		$searchQuery = $this->preProcessQuery($searchQuery);
+
 		$builder = $this->getQueryBuilder();
 
 		$requestedFields = array_merge(
@@ -253,4 +259,49 @@ public function getCachesAndMountPointsForSearch(IRootFolder $root, string $path
 
 		return [$caches, $mountByMountPoint];
 	}
+
+	private function preProcessQuery(ISearchQuery $searchQuery): ISearchQuery {
+		// when sharding is enabled, we can't join on the mounts table
+		// so instead we need to fetch the matching mount root ids and filter on those
+		if ($this->connection->getShardDefinition('filecache') !== null) {
+			$operation = $this->replaceMountNameWithRootIds($searchQuery->getSearchOperation());
+			return new SearchQuery(
+				$operation,
+				$searchQuery->getLimit(),
+				$searchQuery->getOffset(),
+				$searchQuery->getOrder(),
+				$searchQuery->getUser(),
+				$searchQuery->limitToHome(),
+				$searchQuery->getSelectFields(),
+			);
+		} else {
+			return $searchQuery;
+		}
+	}
+
+	private function replaceMountNameWithRootIds(ISearchOperator $searchOperator): ISearchOperator {
+		if ($searchOperator instanceof ISearchBinaryOperator) {
+			return new SearchBinaryOperator(
+				$searchOperator->getType(),
+				array_map($this->replaceMountNameWithRootIds(...), $searchOperator->getArguments())
+			);
+		} elseif ($searchOperator instanceof ISearchComparison && $searchOperator->getField() === 'mount_point_name') {
+			if (!in_array($searchOperator->getType(), [
+				ISearchComparison::COMPARE_LIKE,
+				ISearchComparison::COMPARE_EQUAL,
+				ISearchComparison::COMPARE_IN,
+			], true)) {
+				throw new \InvalidArgumentException('Filtering mount name with ' . $searchOperator->getType() . ' is not supported');
+			}
+
+			$query = $this->connection->getQueryBuilder();
+			$query->select('root_id')
+				->from('mounts', 'm')
+				->where($this->searchBuilder->searchOperatorToDBExpr($query, $searchOperator));
+			$rootIds = $query->executeQuery()->fetchAll(\PDO::FETCH_COLUMN);
+			return new SearchComparison(ISearchComparison::COMPARE_IN, 'fileid', $rootIds);
+		} else {
+			return $searchOperator;
+		}
+	}
 }