wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Also propagate etag changes when the watcher finds a changed file

Browse source
This commit is contained in:
Robin Appelman 2014-10-14 17:15:46 +02:00
parent e345697cab
commit d26a427f92
3 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/files/cache/updater.php vendored
View file

@ -30,6 +30,11 @@ class Updater {
$this->propagator = new ChangePropagator($view); $this->propagator = new ChangePropagator($view);
} }
public function propagate($path, $time = null) {
$this->propagator->addChange($path);
$this->propagator->propagateChanges($time);
}
/** /**
* Update the cache for $path * Update the cache for $path
* *

2
lib/private/files/view.php
View file

@ -903,6 +903,7 @@ class View {
$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW); $scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
$data = $cache->get($internalPath); $data = $cache->get($internalPath);
} else if ($watcher->checkUpdate($internalPath, $data)) { } else if ($watcher->checkUpdate($internalPath, $data)) {
$this->updater->propagate($path);
$data = $cache->get($internalPath); $data = $cache->get($internalPath);
} }
@ -974,6 +975,7 @@ class View {
$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW); $scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
$data = $cache->get($internalPath); $data = $cache->get($internalPath);
} else if ($watcher->checkUpdate($internalPath, $data)) { } else if ($watcher->checkUpdate($internalPath, $data)) {
$this->updater->propagate($path);
$data = $cache->get($internalPath); $data = $cache->get($internalPath);
} }

31
tests/lib/files/view.php
View file

@ -8,6 +8,7 @@
namespace Test\Files; namespace Test\Files;
use OC\Files\Cache\Watcher; use OC\Files\Cache\Watcher;
use OC\Files\Storage\Temporary;
class TemporaryNoTouch extends \OC\Files\Storage\Temporary { class TemporaryNoTouch extends \OC\Files\Storage\Temporary {
public function touch($path, $mtime = null) { public function touch($path, $mtime = null) {
@ -652,6 +653,36 @@ class View extends \PHPUnit_Framework_TestCase {
$this->assertSame($info['etag'], $info2['etag']); $this->assertSame($info['etag'], $info2['etag']);
} }
public function testWatcherEtagCrossStorage() {
$storage1 = new Temporary(array());
$storage2 = new Temporary(array());
$scanner1 = $storage1->getScanner();
$scanner2 = $storage2->getScanner();
$storage1->mkdir('sub');
\OC\Files\Filesystem::mount($storage1, array(), '/test/');
\OC\Files\Filesystem::mount($storage2, array(), '/test/sub/storage');
$past = time() - 100;
$storage2->file_put_contents('test.txt', 'foobar');
$scanner1->scan('');
$scanner2->scan('');
$view = new \OC\Files\View('');
$storage2->getWatcher('')->setPolicy(Watcher::CHECK_ALWAYS);
$oldFileInfo = $view->getFileInfo('/test/sub/storage/test.txt');
$oldFolderInfo = $view->getFileInfo('/test');
$storage2->getCache()->update($oldFileInfo->getId(), array(
'storage_mtime' => $past
));
$view->getFileInfo('/test/sub/storage/test.txt');
$newFolderInfo = $view->getFileInfo('/test');
$this->assertNotEquals($newFolderInfo->getEtag(), $oldFolderInfo->getEtag());
}
/** /**
* @dataProvider absolutePathProvider * @dataProvider absolutePathProvider
*/ */