upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-06 23:34:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

Merge pull request #45850 from nextcloud/backport/43531/stable28

Browse source 
[stable28] get child ids for folder in a separate query during move
This commit is contained in:
Robin Appelman 2024-06-13 15:58:41 +02:00 committed by GitHub
commit 44eba1c925
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/private/Files/Cache/Cache.php
View file

@ -702,6 +702,11 @@ class Cache implements ICache {
if ($sourceData['mimetype'] === 'httpd/unix-directory') {
//update all child entries
$sourceLength = mb_strlen($sourcePath);
$childIds = $this->getChildIds($sourceStorageId, $sourcePath);
$childChunks = array_chunk($childIds, 1000);
$query = $this->connection->getQueryBuilder();
$fun = $query->func();
@ -714,7 +719,7 @@ class Cache implements ICache {
->set('path_hash', $fun->md5($newPathFunction))
->set('path', $newPathFunction)
->where($query->expr()->eq('storage', $query->createNamedParameter($sourceStorageId, IQueryBuilder::PARAM_INT)))
->andWhere($query->expr()->like('path', $query->createNamedParameter($this->connection->escapeLikeParameter($sourcePath) . '/%')));
->andWhere($query->expr()->in('fileid', $query->createParameter('files')));
// when moving from an encrypted storage to a non-encrypted storage remove the `encrypted` mark
if ($sourceCache->hasEncryptionWrapper() && !$this->hasEncryptionWrapper()) {
@ -727,12 +732,17 @@ class Cache implements ICache {
for ($i = 1; $i <= $retryLimit; $i++) {
try {
$this->connection->beginTransaction();
$query->executeStatement();
foreach ($childChunks as $chunk) {
$query->setParameter('files', $chunk, IQueryBuilder::PARAM_INT_ARRAY);
$query->executeStatement();
}
break;
} catch (\OC\DatabaseException $e) {
$this->connection->rollBack();
throw $e;
} catch (DbalException $e) {
$this->connection->rollBack();
if (!$e->isRetryable()) {
throw $e;
}
@ -742,8 +752,6 @@ class Cache implements ICache {
throw $e;
}
$this->connection->rollBack();
// Sleep a bit to give some time to the other transaction to finish.
usleep(100 * 1000 * $i);
}
@ -785,6 +793,15 @@ class Cache implements ICache {
}
}
private function getChildIds(int $storageId, string $path): array {
$query = $this->connection->getQueryBuilder();
$query->select('fileid')
->from('filecache')
->where($query->expr()->eq('storage', $query->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
->andWhere($query->expr()->like('path', $query->createNamedParameter($this->connection->escapeLikeParameter($path) . '/%')));
return $query->executeQuery()->fetchAll(\PDO::FETCH_COLUMN);
}
/**
* remove all entries for files that are stored on the storage from the cache
*/