Merge pull request #15204 from nextcloud/backport/15146/stable16

[stable16] Prefetching blows up if there are a lot of files.
This commit is contained in:
Roeland Jago Douma 2019-04-24 15:49:09 +02:00 committed by GitHub
commit 621a872306
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 11 deletions

View File

@ -129,13 +129,6 @@ class CustomPropertiesBackend implements BackendInterface {
return;
}
if ($node instanceof Directory
&& $propFind->getDepth() !== 0
) {
// note: pre-fetching only supported for depth <= 1
$this->loadChildrenProperties($node, $requestedProps);
}
$props = $this->getProperties($node, $requestedProps);
foreach ($props as $propName => $propValue) {
$propFind->set($propName, $propValue);

View File

@ -226,10 +226,6 @@ class CustomPropertiesBackendTest extends \Test\TestCase {
->method('getPath')
->will($this->returnValue('/dummypath/test.txt'));
$rootNode->expects($this->once())
->method('getChildren')
->will($this->returnValue(array($nodeSub)));
$this->tree->expects($this->at(0))
->method('getNodeForPath')
->with('/dummypath')