1 files changed, 44 insertions, 46 deletions

diff --git a/lib/private/FilesMetadata/Service/MetadataRequestService.php b/lib/private/FilesMetadata/Service/MetadataRequestService.php
index cdce624d75c..c308ae1c9c8 100644
--- a/lib/private/FilesMetadata/Service/MetadataRequestService.php
+++ b/lib/private/FilesMetadata/Service/MetadataRequestService.php
@@ -2,25 +2,8 @@
 
 declare(strict_types=1);
 /**
- * @copyright 2023 Maxence Lange <maxence@artificial-owl.com>
- *
- * @author Maxence Lange <maxence@artificial-owl.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace OC\FilesMetadata\Service;
@@ -41,10 +24,31 @@ class MetadataRequestService {
 
 	public function __construct(
 		private IDBConnection $dbConnection,
-		private LoggerInterface $logger
+		private LoggerInterface $logger,
 	) {
 	}
 
+	private function getStorageId(IFilesMetadata $filesMetadata): int {
+		if ($filesMetadata instanceof FilesMetadata) {
+			$storage = $filesMetadata->getStorageId();
+			if ($storage) {
+				return $storage;
+			}
+		}
+		// all code paths that lead to saving metadata *should* have the storage id set
+		// this fallback is there just in case
+		$query = $this->dbConnection->getQueryBuilder();
+		$query->select('storage')
+			->from('filecache')
+			->where($query->expr()->eq('fileid', $query->createNamedParameter($filesMetadata->getFileId(), IQueryBuilder::PARAM_INT)));
+		$storageId = $query->executeQuery()->fetchColumn();
+
+		if ($filesMetadata instanceof FilesMetadata) {
+			$filesMetadata->setStorageId($storageId);
+		}
+		return $storageId;
+	}
+
 	/**
 	 * store metadata into database
 	 *
@@ -55,10 +59,11 @@ class MetadataRequestService {
 	public function store(IFilesMetadata $filesMetadata): void {
 		$qb = $this->dbConnection->getQueryBuilder();
 		$qb->insert(self::TABLE_METADATA)
-		   ->setValue('file_id', $qb->createNamedParameter($filesMetadata->getFileId(), IQueryBuilder::PARAM_INT))
-		   ->setValue('json', $qb->createNamedParameter(json_encode($filesMetadata->jsonSerialize())))
-		   ->setValue('sync_token', $qb->createNamedParameter($this->generateSyncToken()))
-		   ->setValue('last_update', (string) $qb->createFunction('NOW()'));
+			->hintShardKey('storage', $this->getStorageId($filesMetadata))
+			->setValue('file_id', $qb->createNamedParameter($filesMetadata->getFileId(), IQueryBuilder::PARAM_INT))
+			->setValue('json', $qb->createNamedParameter(json_encode($filesMetadata->jsonSerialize())))
+			->setValue('sync_token', $qb->createNamedParameter($this->generateSyncToken()))
+			->setValue('last_update', (string)$qb->createFunction('NOW()'));
 		$qb->executeStatement();
 	}
 
@@ -74,16 +79,12 @@ class MetadataRequestService {
 		try {
 			$qb = $this->dbConnection->getQueryBuilder();
 			$qb->select('json', 'sync_token')->from(self::TABLE_METADATA);
-			$qb->where(
-				$qb->expr()->eq('file_id', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT))
-			);
+			$qb->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
 			$result = $qb->executeQuery();
 			$data = $result->fetch();
 			$result->closeCursor();
 		} catch (Exception $e) {
-			$this->logger->warning(
-				'exception while getMetadataFromDatabase()', ['exception' => $e, 'fileId' => $fileId]
-			);
+			$this->logger->warning('exception while getMetadataFromDatabase()', ['exception' => $e, 'fileId' => $fileId]);
 			throw new FilesMetadataNotFoundException();
 		}
 
@@ -100,8 +101,6 @@ class MetadataRequestService {
 	/**
 	 * returns metadata for multiple file ids
 	 *
-	 * If
-	 *
 	 * @param array $fileIds file ids
 	 *
 	 * @return array File ID is the array key, files without metadata are not returned in the array
@@ -110,14 +109,12 @@ class MetadataRequestService {
 	public function getMetadataFromFileIds(array $fileIds): array {
 		$qb = $this->dbConnection->getQueryBuilder();
 		$qb->select('file_id', 'json', 'sync_token')->from(self::TABLE_METADATA);
-		$qb->where(
-			$qb->expr()->in('file_id', $qb->createNamedParameter($fileIds, IQueryBuilder::PARAM_INT_ARRAY))
-		);
+		$qb->where($qb->expr()->in('file_id', $qb->createNamedParameter($fileIds, IQueryBuilder::PARAM_INT_ARRAY)));
 
 		$list = [];
 		$result = $qb->executeQuery();
 		while ($data = $result->fetch()) {
-			$fileId = (int) $data['file_id'];
+			$fileId = (int)$data['file_id'];
 			$metadata = new FilesMetadata($fileId);
 			try {
 				$metadata->importFromDatabase($data);
@@ -142,7 +139,7 @@ class MetadataRequestService {
 	public function dropMetadata(int $fileId): void {
 		$qb = $this->dbConnection->getQueryBuilder();
 		$qb->delete(self::TABLE_METADATA)
-		   ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
+			->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
 		$qb->executeStatement();
 	}
 
@@ -159,15 +156,16 @@ class MetadataRequestService {
 		$expr = $qb->expr();
 
 		$qb->update(self::TABLE_METADATA)
-		   ->set('json', $qb->createNamedParameter(json_encode($filesMetadata->jsonSerialize())))
-		   ->set('sync_token', $qb->createNamedParameter($this->generateSyncToken()))
-		   ->set('last_update', $qb->createFunction('NOW()'))
-		   ->where(
-		   	$expr->andX(
-		   		$expr->eq('file_id', $qb->createNamedParameter($filesMetadata->getFileId(), IQueryBuilder::PARAM_INT)),
-		   		$expr->eq('sync_token', $qb->createNamedParameter($filesMetadata->getSyncToken()))
-		   	)
-		   );
+			->hintShardKey('files_metadata', $this->getStorageId($filesMetadata))
+			->set('json', $qb->createNamedParameter(json_encode($filesMetadata->jsonSerialize())))
+			->set('sync_token', $qb->createNamedParameter($this->generateSyncToken()))
+			->set('last_update', $qb->createFunction('NOW()'))
+			->where(
+				$expr->andX(
+					$expr->eq('file_id', $qb->createNamedParameter($filesMetadata->getFileId(), IQueryBuilder::PARAM_INT)),
+					$expr->eq('sync_token', $qb->createNamedParameter($filesMetadata->getSyncToken()))
+				)
+			);
 
 		return $qb->executeStatement();
 	}