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

Merge pull request #6201 from owncloud/backgroundscan-reuse-etag 

reuse etags when doing a background scan
This commit is contained in:
Vincent Petry 2013-12-06 10:13:14 -08:00
parent 575a68074f 9eca2471b3
commit 123bc9921a
4 changed files with 103 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
config/config.sample.php Normal file → Executable file
View File

2
lib/private/files/cache/scanner.php vendored
View File

@ -286,7 +286,7 @@ class Scanner extends BasicEmitter {
public function backgroundScan() { public function backgroundScan() {
$lastPath = null; $lastPath = null;
while (($path = $this->cache->getIncomplete()) !== false && $path !== $lastPath) { while (($path = $this->cache->getIncomplete()) !== false && $path !== $lastPath) {
$this->scan($path); $this->scan($path, self::SCAN_RECURSIVE, self::REUSE_ETAG);
$this->cache->correctFolderSize($path); $this->cache->correctFolderSize($path);
$lastPath = $path; $lastPath = $path;
} }

79
tests/lib/files/etagtest.php Normal file
View File

@ -0,0 +1,79 @@
<?php
/**
* Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace Test\Files;
use OC\Files\Filesystem;
use OCP\Share;
class EtagTest extends \PHPUnit_Framework_TestCase {
private $datadir;
private $tmpDir;
private $uid;
/**
* @var \OC_User_Dummy $userBackend
*/
private $userBackend;
public function setUp() {
\OC_Hook::clear('OC_Filesystem', 'setup');
\OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
\OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
\OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
$this->datadir = \OC_Config::getValue('datadirectory');
$this->tmpDir = \OC_Helper::tmpFolder();
\OC_Config::setValue('datadirectory', $this->tmpDir);
$this->uid = \OC_User::getUser();
\OC_User::setUserId(null);
$this->userBackend = new \OC_User_Dummy();
\OC_User::useBackend($this->userBackend);
\OC_Util::tearDownFS();
}
public function tearDown() {
\OC_Config::setValue('datadirectory', $this->datadir);
\OC_User::setUserId($this->uid);
\OC_Util::setupFS($this->uid);
}
public function testNewUser() {
$user1 = uniqid('user_');
$this->userBackend->createUser($user1, '');
\OC_Util::tearDownFS();
\OC_User::setUserId($user1);
\OC_Util::setupFS($user1);
Filesystem::mkdir('/folder');
Filesystem::mkdir('/folder/subfolder');
Filesystem::file_put_contents('/foo.txt', 'asd');
Filesystem::file_put_contents('/folder/bar.txt', 'fgh');
Filesystem::file_put_contents('/folder/subfolder/qwerty.txt', 'jkl');
$files = array('/foo.txt', '/folder/bar.txt', '/folder/subfolder', '/folder/subfolder/qwerty.txt');
$originalEtags = $this->getEtags($files);
$scanner = new \OC\Files\Utils\Scanner($user1);
$scanner->backgroundScan('/');
$this->assertEquals($originalEtags, $this->getEtags($files));
}
private function getEtags($files) {
$etags = array();
foreach ($files as $file) {
$info = Filesystem::getFileInfo($file);
$etags[$file] = $info['etag'];
}
return $etags;
}
}

46
tests/lib/files/filesystem.php
View File

@ -26,7 +26,7 @@ class Filesystem extends \PHPUnit_Framework_TestCase {
/** /**
* @var array tmpDirs * @var array tmpDirs
*/ */
private $tmpDirs=array(); private $tmpDirs = array();
/** /**
* @return array * @return array
@ -51,21 +51,21 @@ class Filesystem extends \PHPUnit_Framework_TestCase {
} }
public function testMount() { public function testMount() {
\OC\Files\Filesystem::mount('\OC\Files\Storage\Local',self::getStorageData(),'/'); \OC\Files\Filesystem::mount('\OC\Files\Storage\Local', self::getStorageData(), '/');
$this->assertEquals('/',\OC\Files\Filesystem::getMountPoint('/')); $this->assertEquals('/', \OC\Files\Filesystem::getMountPoint('/'));
$this->assertEquals('/',\OC\Files\Filesystem::getMountPoint('/some/folder')); $this->assertEquals('/', \OC\Files\Filesystem::getMountPoint('/some/folder'));
list( , $internalPath)=\OC\Files\Filesystem::resolvePath('/'); list(, $internalPath) = \OC\Files\Filesystem::resolvePath('/');
$this->assertEquals('',$internalPath); $this->assertEquals('', $internalPath);
list( , $internalPath)=\OC\Files\Filesystem::resolvePath('/some/folder'); list(, $internalPath) = \OC\Files\Filesystem::resolvePath('/some/folder');
$this->assertEquals('some/folder',$internalPath); $this->assertEquals('some/folder', $internalPath);
\OC\Files\Filesystem::mount('\OC\Files\Storage\Local',self::getStorageData(),'/some'); \OC\Files\Filesystem::mount('\OC\Files\Storage\Local', self::getStorageData(), '/some');
$this->assertEquals('/',\OC\Files\Filesystem::getMountPoint('/')); $this->assertEquals('/', \OC\Files\Filesystem::getMountPoint('/'));
$this->assertEquals('/some/',\OC\Files\Filesystem::getMountPoint('/some/folder')); $this->assertEquals('/some/', \OC\Files\Filesystem::getMountPoint('/some/folder'));
$this->assertEquals('/some/',\OC\Files\Filesystem::getMountPoint('/some/')); $this->assertEquals('/some/', \OC\Files\Filesystem::getMountPoint('/some/'));
$this->assertEquals('/some/',\OC\Files\Filesystem::getMountPoint('/some')); $this->assertEquals('/some/', \OC\Files\Filesystem::getMountPoint('/some'));
list( , $internalPath)=\OC\Files\Filesystem::resolvePath('/some/folder'); list(, $internalPath) = \OC\Files\Filesystem::resolvePath('/some/folder');
$this->assertEquals('folder',$internalPath); $this->assertEquals('folder', $internalPath);
} }
public function testNormalize() { public function testNormalize() {
@ -136,20 +136,20 @@ class Filesystem extends \PHPUnit_Framework_TestCase {
} }
public function testHooks() { public function testHooks() {
if(\OC\Files\Filesystem::getView()){ if (\OC\Files\Filesystem::getView()) {
$user = \OC_User::getUser(); $user = \OC_User::getUser();
}else{ } else {
$user=uniqid(); $user = uniqid();
\OC\Files\Filesystem::init($user, '/'.$user.'/files'); \OC\Files\Filesystem::init($user, '/' . $user . '/files');
} }
\OC_Hook::clear('OC_Filesystem'); \OC_Hook::clear('OC_Filesystem');
\OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook'); \OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook');
\OC\Files\Filesystem::mount('OC\Files\Storage\Temporary', array(), '/'); \OC\Files\Filesystem::mount('OC\Files\Storage\Temporary', array(), '/');
$rootView=new \OC\Files\View(''); $rootView = new \OC\Files\View('');
$rootView->mkdir('/'.$user); $rootView->mkdir('/' . $user);
$rootView->mkdir('/'.$user.'/files'); $rootView->mkdir('/' . $user . '/files');
// \OC\Files\Filesystem::file_put_contents('/foo', 'foo'); // \OC\Files\Filesystem::file_put_contents('/foo', 'foo');
\OC\Files\Filesystem::mkdir('/bar'); \OC\Files\Filesystem::mkdir('/bar');
@ -215,7 +215,7 @@ class Filesystem extends \PHPUnit_Framework_TestCase {
$homeMount = \OC\Files\Filesystem::getStorage('/' . $userId . '/'); $homeMount = \OC\Files\Filesystem::getStorage('/' . $userId . '/');
$this->assertInstanceOf('\OC\Files\Storage\Home', $homeMount); $this->assertInstanceOf('\OC\Files\Storage\Home', $homeMount);
$this->assertEquals('local::' . $datadir. '/' . $userId . '/', $homeMount->getId()); $this->assertEquals('local::' . $datadir . '/' . $userId . '/', $homeMount->getId());
\OC_User::deleteUser($userId); \OC_User::deleteUser($userId);
// delete storage entry // delete storage entry