Move query outside the loop and reduce chunk size to 1000backport/29281/stable20

This involved changing CacheQueryBuilder\whereParentIn to take a
parameter name, renaming the function accordingly.

Signed-off-by: Sijmen Schoon <me@sijmenschoon.nl>

2 files changed, 14 insertions, 12 deletions

diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
index 309facc34e3..d1b219590ef 100644
--- a/lib/private/Files/Cache/Cache.php
+++ b/lib/private/Files/Cache/Cache.php
@@ -584,11 +584,12 @@ class Cache implements ICache {
 				return $cacheEntry->getId();
 			}, $children);
 
-			$childIdChunks = array_chunk($childIds, 2048);
-			foreach ($childIdChunks as $childIdChunk) {
-				$query = $this->getQueryBuilder();
-				$query->delete('filecache_extended')
-					->where($query->expr()->in('fileid', $query->createNamedParameter($childIdChunk, IQueryBuilder::PARAM_INT_ARRAY)));
+			$query = $this->getQueryBuilder();
+			$query->delete('filecache_extended')
+				->where($query->expr()->in('fileid', $query->createParameter('childIds')));
+			
+			foreach (array_chunk($childIds, 1000) as $childIdChunk) {
+				$query->setParameter('childIds', $childIdChunk, IQueryBuilder::PARAM_INT_ARRAY);
 				$query->execute();
 			}
 
@@ -602,11 +603,12 @@ class Cache implements ICache {
 			}
 		}
 
-		$parentIdChunks = array_chunk($parentIds, 2048);
-		foreach ($parentIdChunks as $parentIdChunk) {
-			$query = $this->getQueryBuilder();
-			$query->delete('filecache')
-				->whereParentIn($parentIdChunk);
+		$query = $this->getQueryBuilder();
+		$query->delete('filecache')
+			->whereParentInParameter('parentIds');
+
+		foreach (array_chunk($parentIds, 1000) as $parentIdChunk) {
+			$query->setParameter('parentIds', $parentIdChunk, IQueryBuilder::PARAM_INT_ARRAY);
 			$query->execute();
 		}
 	}
diff --git a/lib/private/Files/Cache/CacheQueryBuilder.php b/lib/private/Files/Cache/CacheQueryBuilder.php
index ac17cfaffb2..2215cef9a15 100644
--- a/lib/private/Files/Cache/CacheQueryBuilder.php
+++ b/lib/private/Files/Cache/CacheQueryBuilder.php
@@ -95,7 +95,7 @@ class CacheQueryBuilder extends QueryBuilder {
 		return $this;
 	}
 
-	public function whereParentIn(array $parents) {
+	public function whereParentInParameter(string $parameter) {
 		$alias = $this->alias;
 		if ($alias) {
 			$alias .= '.';
@@ -103,7 +103,7 @@ class CacheQueryBuilder extends QueryBuilder {
 			$alias = '';
 		}
 
-		$this->andWhere($this->expr()->in("{$alias}parent", $this->createNamedParameter($parents, IQueryBuilder::PARAM_INT_ARRAY)));
+		$this->andWhere($this->expr()->in("{$alias}parent", $this->createParameter($parameter)));
 
 		return $this;
 	}