mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14598 from nextcloud/backport/14425/stable14 

[stable14] Do not calculate folder size for parent that also needs proper scan, fixes #3524
This commit is contained in:
Morris Jobke 2019-03-08 17:32:16 +01:00 committed by GitHub
parent 67aab99962 3ff6465cdc
commit c9b87701d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 70 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/private/Files/Cache/Cache.php
View File

@ -3,6 +3,7 @@
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Andreas Fischer <bantu@owncloud.com>
* @author Ari Selseng <ari@selseng.net>
* @author Artem Kochnev <MrJeos@gmail.com>
* @author Björn Schießle <bjoern@schiessle.org>
* @author Florin Peter <github@florin-peter.de>
@ -760,16 +761,39 @@ class Cache implements ICache {
* @param string|boolean $path
* @param array $data (optional) meta data of the folder
*/
public function correctFolderSize($path, $data = null) {
public function correctFolderSize($path, $data = null, $isBackgroundScan = false) {
$this->calculateFolderSize($path, $data);
if ($path !== '') {
$parent = dirname($path);
if ($parent === '.' or $parent === '/') {
$parent = '';
}
if ($isBackgroundScan) {
$parentData = $this->get($parent);
if ($parentData['size'] !== -1 && $this->getIncompleteChildrenCount($parentData['fileid']) === 0) {
$this->correctFolderSize($parent, $parentData, $isBackgroundScan);
}
} else {
$this->correctFolderSize($parent);
}
}
}
/**
* get the incomplete count that shares parent $folder
*
* @param int $fileId the file id of the folder
* @return int
*/
public function getIncompleteChildrenCount($fileId) {
if ($fileId > -1) {
$sql = 'SELECT count(*)
FROM `*PREFIX*filecache` WHERE `parent` = ? AND size = -1';
$result = $this->connection->executeQuery($sql, [$fileId]);
return (int)$result->fetchColumn();
}
return -1;
}
/**
* calculate the size of a folder and set it in the cache

2
lib/private/Files/Cache/Scanner.php
View File

@ -532,7 +532,7 @@ class Scanner extends BasicEmitter implements IScanner {
$callback();
\OC_Hook::emit('Scanner', 'correctFolderSize', array('path' => $path));
if ($this->cacheActive && $this->cache instanceof Cache) {
$this->cache->correctFolderSize($path);
$this->cache->correctFolderSize($path, null, true);
}
} catch (\OCP\Files\StorageInvalidException $e) {
// skip unavailable storages

4
lib/private/Files/Cache/Wrapper/CacheJail.php
View File

@ -265,9 +265,9 @@ class CacheJail extends CacheWrapper {
* @param string|boolean $path
* @param array $data (optional) meta data of the folder
*/
public function correctFolderSize($path, $data = null) {
public function correctFolderSize($path, $data = null, $isBackgroundSize = false) {
if ($this->getCache() instanceof Cache) {
$this->getCache()->correctFolderSize($this->getSourcePath($path), $data);
$this->getCache()->correctFolderSize($this->getSourcePath($path), $data, $isBackgroundSize);
}
}

4
lib/private/Files/Cache/Wrapper/CacheWrapper.php
View File

@ -252,9 +252,9 @@ class CacheWrapper extends Cache {
* @param string|boolean $path
* @param array $data (optional) meta data of the folder
*/
public function correctFolderSize($path, $data = null) {
public function correctFolderSize($path, $data = null, $isBackgroundScan = false) {
if ($this->getCache() instanceof Cache) {
$this->getCache()->correctFolderSize($path, $data);
$this->getCache()->correctFolderSize($path, $data, $isBackgroundScan);
}
}

38
tests/lib/Files/Cache/ScannerTest.php
View File

@ -203,6 +203,44 @@ class ScannerTest extends \Test\TestCase {
$this->assertFalse($this->cache->getIncomplete());
}
public function testBackgroundScanNestedIncompleteFolders() {
$this->storage->mkdir('folder');
$this->scanner->backgroundScan();
$this->storage->mkdir('folder/subfolder1');
$this->storage->mkdir('folder/subfolder2');
$this->storage->mkdir('folder/subfolder1/subfolder3');
$this->cache->put('folder', ['size' => -1]);
$this->cache->put('folder/subfolder1', ['size' => -1]);
// do a scan to get the folders into the cache.
$this->scanner->backgroundScan();
$this->assertTrue($this->cache->inCache('folder/subfolder1/subfolder3'));
$this->storage->file_put_contents('folder/subfolder1/bar1.txt', 'foobar');
$this->storage->file_put_contents('folder/subfolder1/subfolder3/bar3.txt', 'foobar');
$this->storage->file_put_contents('folder/subfolder2/bar2.txt', 'foobar');
//mark folders as incomplete.
$this->cache->put('folder/subfolder1', ['size' => -1]);
$this->cache->put('folder/subfolder2', ['size' => -1]);
$this->cache->put('folder/subfolder1/subfolder3', ['size' => -1]);
$this->scanner->backgroundScan();
$this->assertTrue($this->cache->inCache('folder/subfolder1/bar1.txt'));
$this->assertTrue($this->cache->inCache('folder/subfolder2/bar2.txt'));
$this->assertTrue($this->cache->inCache('folder/subfolder1/subfolder3/bar3.txt'));
//check if folder sizes are correct.
$this->assertEquals(18, $this->cache->get('folder')['size']);
$this->assertEquals(12, $this->cache->get('folder/subfolder1')['size']);
$this->assertEquals(6, $this->cache->get('folder/subfolder1/subfolder3')['size']);
$this->assertEquals(6, $this->cache->get('folder/subfolder2')['size']);
}
public function testReuseExisting() {
$this->fillTestFolders();