fix: Backport to 30

Signed-off-by: Louis Chemineau <[email protected]>

apps/files/lib/Command/DeleteOrphanedFiles.php

@@ -48,16 +48,10 @@ public function execute(InputInterface $input, OutputInterface $output): int {
 		$deleteQuery->delete('filecache')
 			->where($deleteQuery->expr()->in('storage', $deleteQuery->createParameter('storage_ids')));
 
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$deletedInLastChunk = 0;
-			$result = $query->execute();
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('objectid', (int) $row['fileid'])
-					->execute();
-			}
-			$result->closeCursor();
+		$deletedStorageChunks = array_chunk($deletedStorages, self::CHUNK_SIZE);
+		foreach ($deletedStorageChunks as $deletedStorageChunk) {
+			$deleteQuery->setParameter('storage_ids', $deletedStorageChunk, IQueryBuilder::PARAM_INT_ARRAY);
+			$deletedEntries += $deleteQuery->executeStatement();
 		}
 
 		$output->writeln("$deletedEntries orphaned file cache entries deleted");

lib/private/DB/QueryBuilder/QueryBuilder.php

@@ -1365,4 +1365,14 @@ public function quoteAlias($alias) {
 
 		return $this->helper->quoteColumnName($alias);
 	}
+
+	public function hintShardKey(string $column, mixed $value, bool $overwrite = false) {
+		return $this;
+	}
+
+	public function runAcrossAllShards() {
+		// noop
+		return $this;
+	}
+
 }

tests/lib/Repair/CleanTagsTest.php

@@ -142,7 +142,7 @@ protected function addTagCategory($category, $type, $user = 'TestRepairCleanTags
 			])
 			->execute();
 
-		return (int) $this->getLastInsertID('vcategory', 'id');
+		return $qb->getLastInsertId();
 	}
 
 	/**
@@ -191,7 +191,7 @@ protected function getFileID() {
 			])
 			->execute();
 
-		$this->createdFile = (int) $this->getLastInsertID('filecache', 'fileid');
+		$this->createdFile = $qb->getLastInsertId();
 		return $this->createdFile;
 	}
 }