sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(FileAccess): Make getAncestorInStorage pass sharding tests 

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
pull/54793/head
Marcel Klehr 2025-09-18 13:36:22 +07:00
parent b158a77365
commit 3522a3375e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/private/Files/Cache/FileAccess.php
Unescape Escape View File

@ -150,10 +150,8 @@ class FileAccess implements IFileAccess {
// End to end encrypted files are descendants of a folder with encrypted=1
// If the filecache table is sharded we need to check with a separate query if the parent is encrypted
$rows = [];
$i = 0;
do {
while ($i < 1000 && ($row = $files->fetch())) {
$i++;
while (count($rows) < 1000 && ($row = $files->fetch())) {
$rows[] = $row;
}
$parents = array_map(function ($row) {
@ -168,15 +166,14 @@ class FileAccess implements IFileAccess {
$parentRows = $result->fetchAll();
$result->closeCursor();
$parentEncryptedByFileId = array_column($parentRows, 'encrypted', 'fileid');
$encryptedByFileId = array_column($parentRows, 'encrypted', 'fileid');
foreach ($rows as $row) {
if ($parentEncryptedByFileId[$row['fileid']] === 1) {
if ($encryptedByFileId[$row['parent']]) {
continue;
}
yield Cache::cacheEntryFromData($row, $this->mimeTypeLoader);
}
$rows = [];
$i = 1;
} while ($rows[] = $files->fetch());
} else {
while (