Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2021-11-04 10:51:37 +0300
committerGitHub <noreply@github.com>2021-11-04 10:51:37 +0300
commit8469b44d57123d23dede823de5425572c004bd19 (patch)
treeae639c871a47f7e472f5d4a1e84725f4197622fb
parentd84c3c98360c341c8c3e6847c6696b68ad143940 (diff)
parent43e829a93e120a0c462bd42acbbe2d7715b8dacf (diff)
Merge pull request #29507 from nextcloud/backport/29281/stable21
-rw-r--r--lib/private/Files/Cache/Cache.php16
-rw-r--r--lib/private/Files/Cache/CacheQueryBuilder.php4
2 files changed, 14 insertions, 6 deletions
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
index 3ede9fac618..34ed6d33a2d 100644
--- a/lib/private/Files/Cache/Cache.php
+++ b/lib/private/Files/Cache/Cache.php
@@ -587,8 +587,12 @@ class Cache implements ICache {
$query = $this->getQueryBuilder();
$query->delete('filecache_extended')
- ->where($query->expr()->in('fileid', $query->createNamedParameter($childIds, IQueryBuilder::PARAM_INT_ARRAY)));
- $query->execute();
+ ->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();
+ }
/** @var ICacheEntry[] $childFolders */
$childFolders = array_filter($children, function ($child) {
@@ -602,8 +606,12 @@ class Cache implements ICache {
$query = $this->getQueryBuilder();
$query->delete('filecache')
- ->whereParentIn($parentIds);
- $query->execute();
+ ->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;
}