Merge pull request #10145 from owncloud/cache-updater-refactor
Refactor cache updater to work outside of the users home
This commit is contained in:
Vincent Petry
commit
d15c3e4030
|
|
@ -57,9 +57,11 @@ class ChangePropagator {
|
|||
*/
|
||||
|
||||
list($storage, $internalPath) = $this->view->resolvePath($parent);
|
||||
$cache = $storage->getCache();
|
||||
$id = $cache->getId($internalPath);
|
||||
$cache->update($id, array('mtime' => $time, 'etag' => $storage->getETag($internalPath)));
|
||||
if ($storage) {
|
||||
$cache = $storage->getCache();
|
||||
$id = $cache->getId($internalPath);
|
||||
$cache->update($id, array('mtime' => $time, 'etag' => $storage->getETag($internalPath)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,9 @@ class HomeCache extends Cache {
|
|||
$totalSize = 0 + $sum;
|
||||
$unencryptedSize = 0 + $unencryptedSum;
|
||||
$entry['size'] += 0;
|
||||
if (!isset($entry['unencrypted_size'])) {
|
||||
$entry['unencrypted_size'] = 0;
|
||||
}
|
||||
$entry['unencrypted_size'] += 0;
|
||||
if ($entry['size'] !== $totalSize) {
|
||||
$this->update($id, array('size' => $totalSize));
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/**
|
||||
* Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
|
||||
* Copyright (c) 2014 Robin Appelman <icewind@owncloud.com>
|
||||
* This file is licensed under the Affero General Public License version 3 or
|
||||
* later.
|
||||
* See the COPYING-README file.
|
||||
|
|
@ -9,165 +9,116 @@
|
|||
namespace OC\Files\Cache;
|
||||
|
||||
/**
|
||||
* listen to filesystem hooks and change the cache accordingly
|
||||
* Update the cache and propagate changes
|
||||
*/
|
||||
class Updater {
|
||||
/**
|
||||
* @var \OC\Files\View
|
||||
*/
|
||||
protected $view;
|
||||
|
||||
/**
|
||||
* resolve a path to a storage and internal path
|
||||
*
|
||||
* @param string $path the relative path
|
||||
* @return array an array consisting of the storage and the internal path
|
||||
* @var \OC\Files\Cache\ChangePropagator
|
||||
*/
|
||||
static public function resolvePath($path) {
|
||||
$view = \OC\Files\Filesystem::getView();
|
||||
return $view->resolvePath($path);
|
||||
protected $propagator;
|
||||
|
||||
/**
|
||||
* @param \OC\Files\View $view
|
||||
*/
|
||||
public function __construct($view) {
|
||||
$this->view = $view;
|
||||
$this->propagator = new ChangePropagator($view);
|
||||
}
|
||||
|
||||
/**
|
||||
* perform a write update
|
||||
* Update the cache for $path
|
||||
*
|
||||
* @param string $path the relative path of the file
|
||||
* @param string $path
|
||||
* @param int $time
|
||||
*/
|
||||
static public function writeUpdate($path) {
|
||||
public function update($path, $time = null) {
|
||||
/**
|
||||
* @var \OC\Files\Storage\Storage $storage
|
||||
* @var string $internalPath
|
||||
*/
|
||||
list($storage, $internalPath) = self::resolvePath($path);
|
||||
list($storage, $internalPath) = $this->view->resolvePath($path);
|
||||
if ($storage) {
|
||||
$this->propagator->addChange($path);
|
||||
$cache = $storage->getCache($internalPath);
|
||||
$scanner = $storage->getScanner($internalPath);
|
||||
$data = $scanner->scan($internalPath, Scanner::SCAN_SHALLOW);
|
||||
$this->correctParentStorageMtime($storage, $internalPath);
|
||||
$cache->correctFolderSize($internalPath, $data);
|
||||
self::correctFolder($path, $storage->filemtime($internalPath));
|
||||
self::correctParentStorageMtime($storage, $internalPath);
|
||||
$this->propagator->propagateChanges($time);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* perform a delete update
|
||||
* Remove $path from the cache
|
||||
*
|
||||
* @param string $path the relative path of the file
|
||||
* @param string $path
|
||||
*/
|
||||
static public function deleteUpdate($path) {
|
||||
public function remove($path) {
|
||||
/**
|
||||
* @var \OC\Files\Storage\Storage $storage
|
||||
* @var string $internalPath
|
||||
*/
|
||||
list($storage, $internalPath) = self::resolvePath($path);
|
||||
list($storage, $internalPath) = $this->view->resolvePath($path);
|
||||
if ($storage) {
|
||||
$parent = dirname($internalPath);
|
||||
if ($parent === '.') {
|
||||
$parent = '';
|
||||
}
|
||||
$this->propagator->addChange($path);
|
||||
$cache = $storage->getCache($internalPath);
|
||||
$cache->remove($internalPath);
|
||||
$cache->correctFolderSize($parent);
|
||||
self::correctFolder($path, time());
|
||||
self::correctParentStorageMtime($storage, $internalPath);
|
||||
$this->correctParentStorageMtime($storage, $internalPath);
|
||||
$this->propagator->propagateChanges();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* preform a rename update
|
||||
*
|
||||
* @param string $from the relative path of the source file
|
||||
* @param string $to the relative path of the target file
|
||||
* @param string $source
|
||||
* @param string $target
|
||||
*/
|
||||
static public function renameUpdate($from, $to) {
|
||||
public function rename($source, $target) {
|
||||
/**
|
||||
* @var \OC\Files\Storage\Storage $storageFrom
|
||||
* @var \OC\Files\Storage\Storage $storageTo
|
||||
* @var string $internalFrom
|
||||
* @var string $internalTo
|
||||
* @var \OC\Files\Storage\Storage $sourceStorage
|
||||
* @var \OC\Files\Storage\Storage $targetStorage
|
||||
* @var string $sourceInternalPath
|
||||
* @var string $targetInternalPath
|
||||
*/
|
||||
list($storageFrom, $internalFrom) = self::resolvePath($from);
|
||||
list($sourceStorage, $sourceInternalPath) = $this->view->resolvePath($source);
|
||||
// if it's a moved mountpoint we dont need to do anything
|
||||
if ($internalFrom === '') {
|
||||
if ($sourceInternalPath === '') {
|
||||
return;
|
||||
}
|
||||
list($storageTo, $internalTo) = self::resolvePath($to);
|
||||
if ($storageFrom && $storageTo) {
|
||||
if ($storageFrom === $storageTo) {
|
||||
$cache = $storageFrom->getCache($internalFrom);
|
||||
$cache->move($internalFrom, $internalTo);
|
||||
if (pathinfo($internalFrom, PATHINFO_EXTENSION) !== pathinfo($internalTo, PATHINFO_EXTENSION)) {
|
||||
// redetect mime type change
|
||||
$mimeType = $storageTo->getMimeType($internalTo);
|
||||
$fileId = $storageTo->getCache()->getId($internalTo);
|
||||
$storageTo->getCache()->update($fileId, array('mimetype' => $mimeType));
|
||||
list($targetStorage, $targetInternalPath) = $this->view->resolvePath($target);
|
||||
|
||||
if ($sourceStorage && $targetStorage) {
|
||||
if ($sourceStorage === $targetStorage) {
|
||||
$cache = $sourceStorage->getCache($sourceInternalPath);
|
||||
$cache->move($sourceInternalPath, $targetInternalPath);
|
||||
|
||||
if (pathinfo($sourceInternalPath, PATHINFO_EXTENSION) !== pathinfo($targetInternalPath, PATHINFO_EXTENSION)) {
|
||||
// handle mime type change
|
||||
$mimeType = $sourceStorage->getMimeType($targetInternalPath);
|
||||
$fileId = $cache->getId($targetInternalPath);
|
||||
$cache->update($fileId, array('mimetype' => $mimeType));
|
||||
}
|
||||
$cache->correctFolderSize($internalFrom);
|
||||
$cache->correctFolderSize($internalTo);
|
||||
self::correctFolder($from, time());
|
||||
self::correctFolder($to, time());
|
||||
self::correctParentStorageMtime($storageFrom, $internalFrom);
|
||||
self::correctParentStorageMtime($storageTo, $internalTo);
|
||||
|
||||
$cache->correctFolderSize($sourceInternalPath);
|
||||
$cache->correctFolderSize($targetInternalPath);
|
||||
$this->correctParentStorageMtime($sourceStorage, $sourceInternalPath);
|
||||
$this->correctParentStorageMtime($targetStorage, $targetInternalPath);
|
||||
$this->propagator->addChange($source);
|
||||
$this->propagator->addChange($target);
|
||||
} else {
|
||||
self::deleteUpdate($from);
|
||||
self::writeUpdate($to);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* get file owner and path
|
||||
* @param string $filename
|
||||
* @return string[] with the owner's uid and the owner's path
|
||||
*/
|
||||
private static function getUidAndFilename($filename) {
|
||||
|
||||
$uid = \OC\Files\Filesystem::getOwner($filename);
|
||||
\OC\Files\Filesystem::initMountPoints($uid);
|
||||
|
||||
$filename = (strpos($filename, '/') !== 0) ? '/' . $filename : $filename;
|
||||
if ($uid != \OCP\User::getUser()) {
|
||||
$info = \OC\Files\Filesystem::getFileInfo($filename);
|
||||
if (!$info) {
|
||||
return array($uid, '/files' . $filename);
|
||||
}
|
||||
$ownerView = new \OC\Files\View('/' . $uid . '/files');
|
||||
$filename = $ownerView->getPath($info['fileid']);
|
||||
}
|
||||
return array($uid, '/files' . $filename);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the mtime and ETag of all parent folders
|
||||
*
|
||||
* @param string $path
|
||||
* @param string $time
|
||||
*/
|
||||
static public function correctFolder($path, $time) {
|
||||
if ($path !== '' && $path !== '/' && $path !== '\\') {
|
||||
list($owner, $realPath) = self::getUidAndFilename(dirname($path));
|
||||
|
||||
/**
|
||||
* @var \OC\Files\Storage\Storage $storage
|
||||
* @var string $internalPath
|
||||
*/
|
||||
$view = new \OC\Files\View('/' . $owner);
|
||||
|
||||
list($storage, $internalPath) = $view->resolvePath($realPath);
|
||||
$cache = $storage->getCache();
|
||||
$id = $cache->getId($internalPath);
|
||||
|
||||
while ($id !== -1) {
|
||||
$cache->update($id, array('mtime' => $time, 'etag' => $storage->getETag($internalPath)));
|
||||
if ($realPath !== '') {
|
||||
$realPath = dirname($realPath);
|
||||
if ($realPath === DIRECTORY_SEPARATOR) {
|
||||
$realPath = "";
|
||||
}
|
||||
// check storage for parent in case we change the storage in this step
|
||||
list($storage, $internalPath) = $view->resolvePath($realPath);
|
||||
$cache = $storage->getCache();
|
||||
$id = $cache->getId($internalPath);
|
||||
} else {
|
||||
$id = -1;
|
||||
}
|
||||
$this->remove($source);
|
||||
$this->update($target);
|
||||
}
|
||||
$this->propagator->propagateChanges();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -177,52 +128,17 @@ class Updater {
|
|||
* @param \OC\Files\Storage\Storage $storage
|
||||
* @param string $internalPath
|
||||
*/
|
||||
static private function correctParentStorageMtime($storage, $internalPath) {
|
||||
private function correctParentStorageMtime($storage, $internalPath) {
|
||||
$cache = $storage->getCache();
|
||||
$parentId = $cache->getParentId($internalPath);
|
||||
$parent = dirname($internalPath);
|
||||
|
||||
if ($parent === '.' || $parent === '/' || $parent === '\\') {
|
||||
$parent = '';
|
||||
}
|
||||
|
||||
if ($parentId != -1) {
|
||||
$cache->update($parentId, array('storage_mtime' => $storage->filemtime($parent)));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $params
|
||||
*/
|
||||
static public function writeHook($params) {
|
||||
self::writeUpdate($params['path']);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $params
|
||||
*/
|
||||
static public function touchHook($params) {
|
||||
$path = $params['path'];
|
||||
list($storage, $internalPath) = self::resolvePath($path);
|
||||
$cache = $storage->getCache();
|
||||
$id = $cache->getId($internalPath);
|
||||
if ($id !== -1) {
|
||||
$cache->update($id, array('etag' => $storage->getETag($internalPath)));
|
||||
}
|
||||
self::writeUpdate($path);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $params
|
||||
*/
|
||||
static public function renameHook($params) {
|
||||
self::renameUpdate($params['oldpath'], $params['newpath']);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $params
|
||||
*/
|
||||
static public function deleteHook($params) {
|
||||
self::deleteUpdate($params['path']);
|
||||
public function __destruct() {
|
||||
// propagate any leftover changes
|
||||
$this->propagator->propagateChanges();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,8 +31,14 @@ use OC\Files\Mount\MoveableMount;
|
|||
class View {
|
||||
private $fakeRoot = '';
|
||||
|
||||
/**
|
||||
* @var \OC\Files\Cache\Updater
|
||||
*/
|
||||
protected $updater;
|
||||
|
||||
public function __construct($root = '') {
|
||||
$this->fakeRoot = $root;
|
||||
$this->updater = new Updater($this);
|
||||
}
|
||||
|
||||
public function getAbsolutePath($path = '/') {
|
||||
|
|
@ -168,10 +174,10 @@ class View {
|
|||
* @param string $path relative to data/
|
||||
* @return boolean
|
||||
*/
|
||||
protected function removeMount($mount, $path){
|
||||
protected function removeMount($mount, $path) {
|
||||
if ($mount instanceof MoveableMount) {
|
||||
// cut of /user/files to get the relative path to data/user/files
|
||||
$pathParts= explode('/', $path, 4);
|
||||
$pathParts = explode('/', $path, 4);
|
||||
$relPath = '/' . $pathParts[3];
|
||||
\OC_Hook::emit(
|
||||
Filesystem::CLASSNAME, "umount",
|
||||
|
|
@ -194,7 +200,7 @@ class View {
|
|||
}
|
||||
|
||||
public function rmdir($path) {
|
||||
$absolutePath= $this->getAbsolutePath($path);
|
||||
$absolutePath = $this->getAbsolutePath($path);
|
||||
$mount = Filesystem::getMountManager()->find($absolutePath);
|
||||
if ($mount->getInternalPath($absolutePath) === '') {
|
||||
return $this->removeMount($mount, $path);
|
||||
|
|
@ -310,6 +316,9 @@ class View {
|
|||
if(!$this->file_exists($path)){
|
||||
return false;
|
||||
}
|
||||
if (is_null($mtime)) {
|
||||
$mtime = time();
|
||||
}
|
||||
//if native touch fails, we emulate it by changing the mtime in the cache
|
||||
$this->putFileInfo($path, array('mtime' => $mtime));
|
||||
}
|
||||
|
|
@ -374,10 +383,8 @@ class View {
|
|||
list ($count, $result) = \OC_Helper::streamCopy($data, $target);
|
||||
fclose($target);
|
||||
fclose($data);
|
||||
$this->updater->update($path);
|
||||
if ($this->shouldEmitHooks($path) && $result !== false) {
|
||||
Updater::writeHook(array(
|
||||
'path' => $this->getHookPath($path)
|
||||
));
|
||||
$this->emit_file_hooks_post($exists, $path);
|
||||
}
|
||||
\OC_FileProxy::runPostProxies('file_put_contents', $absolutePath, $count);
|
||||
|
|
@ -402,7 +409,7 @@ class View {
|
|||
$postFix = (substr($path, -1, 1) === '/') ? '/' : '';
|
||||
$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
|
||||
$mount = Filesystem::getMountManager()->find($absolutePath . $postFix);
|
||||
if ($mount->getInternalPath($absolutePath) === '') {
|
||||
if ($mount and $mount->getInternalPath($absolutePath) === '') {
|
||||
return $this->removeMount($mount, $absolutePath);
|
||||
}
|
||||
return $this->basicOperation('unlink', $path, array('delete'));
|
||||
|
|
@ -495,15 +502,14 @@ class View {
|
|||
}
|
||||
}
|
||||
}
|
||||
if ($this->shouldEmitHooks() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) {
|
||||
if ((Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) {
|
||||
// if it was a rename from a part file to a regular file it was a write and not a rename operation
|
||||
Updater::writeHook(array('path' => $this->getHookPath($path2)));
|
||||
$this->emit_file_hooks_post($exists, $path2);
|
||||
$this->updater->update($path2);
|
||||
if ($this->shouldEmitHooks()) {
|
||||
$this->emit_file_hooks_post($exists, $path2);
|
||||
}
|
||||
} elseif ($this->shouldEmitHooks() && $result !== false) {
|
||||
Updater::renameHook(array(
|
||||
'oldpath' => $this->getHookPath($path1),
|
||||
'newpath' => $this->getHookPath($path2)
|
||||
));
|
||||
$this->updater->rename($path1, $path2);
|
||||
\OC_Hook::emit(
|
||||
Filesystem::CLASSNAME,
|
||||
Filesystem::signal_post_rename,
|
||||
|
|
@ -582,6 +588,7 @@ class View {
|
|||
fclose($target);
|
||||
}
|
||||
}
|
||||
$this->updater->update($path2);
|
||||
if ($this->shouldEmitHooks() && $result !== false) {
|
||||
\OC_Hook::emit(
|
||||
Filesystem::CLASSNAME,
|
||||
|
|
@ -760,7 +767,19 @@ class View {
|
|||
} else {
|
||||
$result = $storage->$operation($internalPath);
|
||||
}
|
||||
|
||||
$result = \OC_FileProxy::runPostProxies($operation, $this->getAbsolutePath($path), $result);
|
||||
|
||||
if (in_array('delete', $hooks)) {
|
||||
$this->updater->remove($path);
|
||||
}
|
||||
if (in_array('write', $hooks)) {
|
||||
$this->updater->update($path);
|
||||
}
|
||||
if (in_array('touch', $hooks)) {
|
||||
$this->updater->update($path, $extraParam);
|
||||
}
|
||||
|
||||
if ($this->shouldEmitHooks($path) && $result !== false) {
|
||||
if ($operation != 'fopen') { //no post hooks for fopen, the file stream is still open
|
||||
$this->runHooks($hooks, $path, true);
|
||||
|
|
@ -814,16 +833,6 @@ class View {
|
|||
$run = true;
|
||||
if ($this->shouldEmitHooks($path)) {
|
||||
foreach ($hooks as $hook) {
|
||||
// manually triger updater hooks to ensure they are called first
|
||||
if ($post) {
|
||||
if ($hook == 'write') {
|
||||
Updater::writeHook(array('path' => $path));
|
||||
} elseif ($hook == 'touch') {
|
||||
Updater::touchHook(array('path' => $path));
|
||||
} else if ($hook == 'delete') {
|
||||
Updater::deleteHook(array('path' => $path));
|
||||
}
|
||||
}
|
||||
if ($hook != 'read') {
|
||||
\OC_Hook::emit(
|
||||
Filesystem::CLASSNAME,
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase {
|
|||
*/
|
||||
public function testSimplePutFails() {
|
||||
// setup
|
||||
$view = $this->getMock('\OC\Files\View', array('file_put_contents', 'getRelativePath'), array(), '', false);
|
||||
$view = $this->getMock('\OC\Files\View', array('file_put_contents', 'getRelativePath'), array());
|
||||
$view->expects($this->any())
|
||||
->method('file_put_contents')
|
||||
->will($this->returnValue(false));
|
||||
|
|
@ -38,8 +38,7 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase {
|
|||
public function testSimplePutFailsOnRename() {
|
||||
// setup
|
||||
$view = $this->getMock('\OC\Files\View',
|
||||
array('file_put_contents', 'rename', 'getRelativePath', 'filesize'),
|
||||
array(), '', false);
|
||||
array('file_put_contents', 'rename', 'getRelativePath', 'filesize'));
|
||||
$view->expects($this->any())
|
||||
->method('file_put_contents')
|
||||
->withAnyParameters()
|
||||
|
|
@ -72,7 +71,7 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase {
|
|||
*/
|
||||
public function testSimplePutInvalidChars() {
|
||||
// setup
|
||||
$view = $this->getMock('\OC\Files\View', array('file_put_contents', 'getRelativePath'), array(), '', false);
|
||||
$view = $this->getMock('\OC\Files\View', array('file_put_contents', 'getRelativePath'));
|
||||
$view->expects($this->any())
|
||||
->method('file_put_contents')
|
||||
->will($this->returnValue(false));
|
||||
|
|
@ -96,7 +95,7 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase {
|
|||
*/
|
||||
public function testSetNameInvalidChars() {
|
||||
// setup
|
||||
$view = $this->getMock('\OC\Files\View', array('getRelativePath'), array(), '', false);
|
||||
$view = $this->getMock('\OC\Files\View', array('getRelativePath'));
|
||||
|
||||
$view->expects($this->any())
|
||||
->method('getRelativePath')
|
||||
|
|
@ -115,8 +114,7 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase {
|
|||
public function testUploadAbort() {
|
||||
// setup
|
||||
$view = $this->getMock('\OC\Files\View',
|
||||
array('file_put_contents', 'rename', 'getRelativePath', 'filesize'),
|
||||
array(), '', false);
|
||||
array('file_put_contents', 'rename', 'getRelativePath', 'filesize'));
|
||||
$view->expects($this->any())
|
||||
->method('file_put_contents')
|
||||
->withAnyParameters()
|
||||
|
|
|
|||
|
|
@ -8,324 +8,128 @@
|
|||
|
||||
namespace Test\Files\Cache;
|
||||
|
||||
use \OC\Files\Filesystem as Filesystem;
|
||||
use OC\Files\Filesystem;
|
||||
use OC\Files\Storage\Temporary;
|
||||
use OC\Files\View;
|
||||
|
||||
class Updater extends \PHPUnit_Framework_TestCase {
|
||||
/**
|
||||
* @var \OC\Files\Storage\Storage $storage
|
||||
* @var \OC\Files\Storage\Storage
|
||||
*/
|
||||
private $storage;
|
||||
protected $storage;
|
||||
|
||||
/**
|
||||
* @var \OC\Files\Cache\Scanner $scanner
|
||||
* @var \OC\Files\Cache\Cache
|
||||
*/
|
||||
private $scanner;
|
||||
|
||||
private $stateFilesEncryption;
|
||||
protected $cache;
|
||||
|
||||
/**
|
||||
* @var \OC\Files\Cache\Cache $cache
|
||||
* @var \OC\Files\View
|
||||
*/
|
||||
private $cache;
|
||||
protected $view;
|
||||
|
||||
private static $user;
|
||||
/**
|
||||
* @var \OC\Files\Cache\Updater
|
||||
*/
|
||||
protected $updater;
|
||||
|
||||
public function setUp() {
|
||||
|
||||
// remember files_encryption state
|
||||
$this->stateFilesEncryption = \OC_App::isEnabled('files_encryption');
|
||||
// we want to tests with the encryption app disabled
|
||||
\OC_App::disable('files_encryption');
|
||||
|
||||
$this->storage = new \OC\Files\Storage\Temporary(array());
|
||||
$textData = "dummy file data\n";
|
||||
$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png');
|
||||
$this->storage->mkdir('folder');
|
||||
$this->storage->file_put_contents('foo.txt', $textData);
|
||||
$this->storage->file_put_contents('foo.png', $imgData);
|
||||
$this->storage->file_put_contents('folder/bar.txt', $textData);
|
||||
$this->storage->file_put_contents('folder/bar2.txt', $textData);
|
||||
|
||||
$this->scanner = $this->storage->getScanner();
|
||||
$this->scanner->scan('');
|
||||
$this->cache = $this->storage->getCache();
|
||||
|
||||
\OC\Files\Filesystem::tearDown();
|
||||
if (!self::$user) {
|
||||
self::$user = uniqid();
|
||||
}
|
||||
|
||||
\OC_User::createUser(self::$user, 'password');
|
||||
\OC_User::setUserId(self::$user);
|
||||
|
||||
\OC\Files\Filesystem::init(self::$user, '/' . self::$user . '/files');
|
||||
|
||||
$this->storage = new Temporary(array());
|
||||
Filesystem::clearMounts();
|
||||
Filesystem::mount($this->storage, array(), '/' . self::$user . '/files');
|
||||
|
||||
\OC_Hook::clear('OC_Filesystem');
|
||||
Filesystem::mount($this->storage, array(), '/');
|
||||
$this->view = new View('');
|
||||
$this->updater = new \OC\Files\Cache\Updater($this->view);
|
||||
$this->cache = $this->storage->getCache();
|
||||
}
|
||||
|
||||
public function tearDown() {
|
||||
if ($this->cache) {
|
||||
$this->cache->clear();
|
||||
}
|
||||
$result = \OC_User::deleteUser(self::$user);
|
||||
$this->assertTrue($result);
|
||||
Filesystem::tearDown();
|
||||
// reset app files_encryption
|
||||
if ($this->stateFilesEncryption) {
|
||||
\OC_App::enable('files_encryption');
|
||||
}
|
||||
}
|
||||
public function testNewFile() {
|
||||
$this->storage->file_put_contents('foo.txt', 'bar');
|
||||
$this->assertFalse($this->cache->inCache('foo.txt'));
|
||||
|
||||
public function testWrite() {
|
||||
$textSize = strlen("dummy file data\n");
|
||||
$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
|
||||
$this->cache->put('foo.txt', array('mtime' => 100, 'storage_mtime' => 150));
|
||||
$rootCachedData = $this->cache->get('');
|
||||
$this->assertEquals(3 * $textSize + $imageSize, $rootCachedData['size']);
|
||||
|
||||
$fooCachedData = $this->cache->get('foo.txt');
|
||||
Filesystem::file_put_contents('foo.txt', 'asd');
|
||||
$cachedData = $this->cache->get('foo.txt');
|
||||
$this->assertEquals(3, $cachedData['size']);
|
||||
$this->assertInternalType('string', $fooCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($fooCachedData['etag'], $cachedData['etag']);
|
||||
$cachedData = $this->cache->get('');
|
||||
$this->assertEquals(2 * $textSize + $imageSize + 3, $cachedData['size']);
|
||||
$this->assertInternalType('string', $rootCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
|
||||
$rootCachedData = $cachedData;
|
||||
|
||||
$this->assertFalse($this->cache->inCache('bar.txt'));
|
||||
Filesystem::file_put_contents('bar.txt', 'asd');
|
||||
$this->assertTrue($this->cache->inCache('bar.txt'));
|
||||
$cachedData = $this->cache->get('bar.txt');
|
||||
$this->assertEquals(3, $cachedData['size']);
|
||||
$mtime = $cachedData['mtime'];
|
||||
$cachedData = $this->cache->get('');
|
||||
$this->assertEquals(2 * $textSize + $imageSize + 2 * 3, $cachedData['size']);
|
||||
$this->assertInternalType('string', $rootCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $mtime);
|
||||
}
|
||||
|
||||
public function testWriteWithMountPoints() {
|
||||
$storage2 = new \OC\Files\Storage\Temporary(array());
|
||||
$storage2->getScanner()->scan(''); //initialize etags
|
||||
$cache2 = $storage2->getCache();
|
||||
Filesystem::mount($storage2, array(), '/' . self::$user . '/files/folder/substorage');
|
||||
$folderCachedData = $this->cache->get('folder');
|
||||
$substorageCachedData = $cache2->get('');
|
||||
Filesystem::file_put_contents('folder/substorage/foo.txt', 'asd');
|
||||
$this->assertTrue($cache2->inCache('foo.txt'));
|
||||
$cachedData = $cache2->get('foo.txt');
|
||||
$this->assertEquals(3, $cachedData['size']);
|
||||
$mtime = $cachedData['mtime'];
|
||||
|
||||
$cachedData = $cache2->get('');
|
||||
$this->assertInternalType('string', $substorageCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($substorageCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertEquals($mtime, $cachedData['mtime']);
|
||||
|
||||
$cachedData = $this->cache->get('folder');
|
||||
$this->assertInternalType('string', $folderCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($folderCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertEquals($mtime, $cachedData['mtime']);
|
||||
}
|
||||
|
||||
public function testDelete() {
|
||||
$textSize = strlen("dummy file data\n");
|
||||
$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
|
||||
$rootCachedData = $this->cache->get('');
|
||||
$this->assertEquals(3 * $textSize + $imageSize, $rootCachedData['size']);
|
||||
$this->updater->update('/foo.txt');
|
||||
|
||||
$this->assertTrue($this->cache->inCache('foo.txt'));
|
||||
Filesystem::unlink('foo.txt');
|
||||
$this->assertFalse($this->cache->inCache('foo.txt'));
|
||||
$cachedData = $this->cache->get('');
|
||||
$this->assertEquals(2 * $textSize + $imageSize, $cachedData['size']);
|
||||
$this->assertInternalType('string', $rootCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']);
|
||||
$rootCachedData = $cachedData;
|
||||
|
||||
Filesystem::mkdir('bar_folder');
|
||||
$this->assertTrue($this->cache->inCache('bar_folder'));
|
||||
$cachedData = $this->cache->get('');
|
||||
$this->assertInternalType('string', $rootCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
|
||||
$rootCachedData = $cachedData;
|
||||
Filesystem::rmdir('bar_folder');
|
||||
$this->assertFalse($this->cache->inCache('bar_folder'));
|
||||
$cachedData = $this->cache->get('');
|
||||
$this->assertInternalType('string', $rootCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']);
|
||||
$cached = $this->cache->get('foo.txt');
|
||||
$this->assertEquals(3, $cached['size']);
|
||||
$this->assertEquals('text/plain', $cached['mimetype']);
|
||||
}
|
||||
|
||||
public function testDeleteWithMountPoints() {
|
||||
$storage2 = new \OC\Files\Storage\Temporary(array());
|
||||
$cache2 = $storage2->getCache();
|
||||
Filesystem::mount($storage2, array(), '/' . self::$user . '/files/folder/substorage');
|
||||
Filesystem::file_put_contents('folder/substorage/foo.txt', 'asd');
|
||||
$this->assertTrue($cache2->inCache('foo.txt'));
|
||||
$folderCachedData = $this->cache->get('folder');
|
||||
$substorageCachedData = $cache2->get('');
|
||||
Filesystem::unlink('folder/substorage/foo.txt');
|
||||
$this->assertFalse($cache2->inCache('foo.txt'));
|
||||
public function testUpdatedFile() {
|
||||
$this->view->file_put_contents('/foo.txt', 'bar');
|
||||
$cached = $this->cache->get('foo.txt');
|
||||
$this->assertEquals(3, $cached['size']);
|
||||
$this->assertEquals('text/plain', $cached['mimetype']);
|
||||
|
||||
$cachedData = $cache2->get('');
|
||||
$this->assertInternalType('string', $substorageCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($substorageCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertGreaterThanOrEqual($substorageCachedData['mtime'], $cachedData['mtime']);
|
||||
$this->storage->file_put_contents('foo.txt', 'qwerty');
|
||||
|
||||
$cachedData = $this->cache->get('folder');
|
||||
$this->assertInternalType('string', $folderCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($folderCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertGreaterThanOrEqual($folderCachedData['mtime'], $cachedData['mtime']);
|
||||
$cached = $this->cache->get('foo.txt');
|
||||
$this->assertEquals(3, $cached['size']);
|
||||
|
||||
$this->updater->update('/foo.txt');
|
||||
|
||||
$cached = $this->cache->get('foo.txt');
|
||||
$this->assertEquals(6, $cached['size']);
|
||||
}
|
||||
|
||||
public function testRename() {
|
||||
$textSize = strlen("dummy file data\n");
|
||||
$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
|
||||
$rootCachedData = $this->cache->get('');
|
||||
$this->assertEquals(3 * $textSize + $imageSize, $rootCachedData['size']);
|
||||
public function testParentSize() {
|
||||
$this->storage->getScanner()->scan('');
|
||||
|
||||
$parentCached = $this->cache->get('');
|
||||
$this->assertEquals(0, $parentCached['size']);
|
||||
|
||||
$this->storage->file_put_contents('foo.txt', 'bar');
|
||||
|
||||
$parentCached = $this->cache->get('');
|
||||
$this->assertEquals(0, $parentCached['size']);
|
||||
|
||||
$this->updater->update('foo.txt');
|
||||
|
||||
$parentCached = $this->cache->get('');
|
||||
$this->assertEquals(3, $parentCached['size']);
|
||||
|
||||
$this->storage->file_put_contents('foo.txt', 'qwerty');
|
||||
|
||||
$parentCached = $this->cache->get('');
|
||||
$this->assertEquals(3, $parentCached['size']);
|
||||
|
||||
$this->updater->update('foo.txt');
|
||||
|
||||
$parentCached = $this->cache->get('');
|
||||
$this->assertEquals(6, $parentCached['size']);
|
||||
|
||||
$this->storage->unlink('foo.txt');
|
||||
|
||||
$parentCached = $this->cache->get('');
|
||||
$this->assertEquals(6, $parentCached['size']);
|
||||
|
||||
$this->updater->remove('foo.txt');
|
||||
|
||||
$parentCached = $this->cache->get('');
|
||||
$this->assertEquals(0, $parentCached['size']);
|
||||
}
|
||||
|
||||
public function testMove() {
|
||||
$this->storage->file_put_contents('foo.txt', 'qwerty');
|
||||
$this->updater->update('foo.txt');
|
||||
|
||||
$this->assertTrue($this->cache->inCache('foo.txt'));
|
||||
$fooCachedData = $this->cache->get('foo.txt');
|
||||
$this->assertFalse($this->cache->inCache('bar.txt'));
|
||||
Filesystem::rename('foo.txt', 'bar.txt');
|
||||
$cached = $this->cache->get('foo.txt');
|
||||
|
||||
$this->storage->rename('foo.txt', 'bar.txt');
|
||||
|
||||
$this->assertTrue($this->cache->inCache('foo.txt'));
|
||||
$this->assertFalse($this->cache->inCache('bar.txt'));
|
||||
|
||||
$this->updater->rename('foo.txt', 'bar.txt');
|
||||
|
||||
$this->assertFalse($this->cache->inCache('foo.txt'));
|
||||
$this->assertTrue($this->cache->inCache('bar.txt'));
|
||||
$cachedData = $this->cache->get('bar.txt');
|
||||
$this->assertEquals($fooCachedData['fileid'], $cachedData['fileid']);
|
||||
$mtime = $cachedData['mtime'];
|
||||
$cachedData = $this->cache->get('');
|
||||
$this->assertEquals(3 * $textSize + $imageSize, $cachedData['size']);
|
||||
$this->assertInternalType('string', $rootCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
|
||||
|
||||
$cachedTarget = $this->cache->get('bar.txt');
|
||||
$this->assertEquals($cached['etag'], $cachedTarget['etag']);
|
||||
$this->assertEquals($cached['mtime'], $cachedTarget['mtime']);
|
||||
$this->assertEquals($cached['size'], $cachedTarget['size']);
|
||||
$this->assertEquals($cached['fileid'], $cachedTarget['fileid']);
|
||||
}
|
||||
|
||||
public function testRenameExtension() {
|
||||
$fooCachedData = $this->cache->get('foo.txt');
|
||||
$this->assertEquals('text/plain', $fooCachedData['mimetype']);
|
||||
Filesystem::rename('foo.txt', 'foo.abcd');
|
||||
$fooCachedData = $this->cache->get('foo.abcd');
|
||||
$this->assertEquals('application/octet-stream', $fooCachedData['mimetype']);
|
||||
}
|
||||
|
||||
public function testRenameWithMountPoints() {
|
||||
$storage2 = new \OC\Files\Storage\Temporary(array());
|
||||
$cache2 = $storage2->getCache();
|
||||
Filesystem::mount($storage2, array(), '/' . self::$user . '/files/folder/substorage');
|
||||
Filesystem::file_put_contents('folder/substorage/foo.txt', 'asd');
|
||||
$this->assertTrue($cache2->inCache('foo.txt'));
|
||||
$folderCachedData = $this->cache->get('folder');
|
||||
$substorageCachedData = $cache2->get('');
|
||||
$fooCachedData = $cache2->get('foo.txt');
|
||||
Filesystem::rename('folder/substorage/foo.txt', 'folder/substorage/bar.txt');
|
||||
$this->assertFalse($cache2->inCache('foo.txt'));
|
||||
$this->assertTrue($cache2->inCache('bar.txt'));
|
||||
$cachedData = $cache2->get('bar.txt');
|
||||
$this->assertEquals($fooCachedData['fileid'], $cachedData['fileid']);
|
||||
$mtime = $cachedData['mtime'];
|
||||
|
||||
$cachedData = $cache2->get('');
|
||||
$this->assertInternalType('string', $substorageCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($substorageCachedData['etag'], $cachedData['etag']);
|
||||
// rename can cause mtime change - invalid assert
|
||||
// $this->assertEquals($mtime, $cachedData['mtime']);
|
||||
|
||||
$cachedData = $this->cache->get('folder');
|
||||
$this->assertInternalType('string', $folderCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($folderCachedData['etag'], $cachedData['etag']);
|
||||
// rename can cause mtime change - invalid assert
|
||||
// $this->assertEquals($mtime, $cachedData['mtime']);
|
||||
}
|
||||
|
||||
public function testTouch() {
|
||||
$rootCachedData = $this->cache->get('');
|
||||
$fooCachedData = $this->cache->get('foo.txt');
|
||||
Filesystem::touch('foo.txt');
|
||||
$cachedData = $this->cache->get('foo.txt');
|
||||
$this->assertInternalType('string', $fooCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($fooCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertGreaterThanOrEqual($fooCachedData['mtime'], $cachedData['mtime']);
|
||||
|
||||
$cachedData = $this->cache->get('');
|
||||
$this->assertInternalType('string', $rootCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']);
|
||||
$rootCachedData = $cachedData;
|
||||
|
||||
$time = 1371006070;
|
||||
$barCachedData = $this->cache->get('folder/bar.txt');
|
||||
$folderCachedData = $this->cache->get('folder');
|
||||
Filesystem::touch('folder/bar.txt', $time);
|
||||
$cachedData = $this->cache->get('folder/bar.txt');
|
||||
$this->assertInternalType('string', $barCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($barCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertEquals($time, $cachedData['mtime']);
|
||||
|
||||
$cachedData = $this->cache->get('folder');
|
||||
$this->assertInternalType('string', $folderCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($folderCachedData['etag'], $cachedData['etag']);
|
||||
|
||||
$cachedData = $this->cache->get('');
|
||||
$this->assertInternalType('string', $rootCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertEquals($time, $cachedData['mtime']);
|
||||
}
|
||||
|
||||
public function testTouchWithMountPoints() {
|
||||
$storage2 = new \OC\Files\Storage\Temporary(array());
|
||||
$cache2 = $storage2->getCache();
|
||||
Filesystem::mount($storage2, array(), '/' . self::$user . '/files/folder/substorage');
|
||||
Filesystem::file_put_contents('folder/substorage/foo.txt', 'asd');
|
||||
$this->assertTrue($cache2->inCache('foo.txt'));
|
||||
$folderCachedData = $this->cache->get('folder');
|
||||
$substorageCachedData = $cache2->get('');
|
||||
$fooCachedData = $cache2->get('foo.txt');
|
||||
$cachedData = $cache2->get('foo.txt');
|
||||
$time = 1371006070;
|
||||
Filesystem::touch('folder/substorage/foo.txt', $time);
|
||||
$cachedData = $cache2->get('foo.txt');
|
||||
$this->assertInternalType('string', $fooCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($fooCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertEquals($time, $cachedData['mtime']);
|
||||
|
||||
$cachedData = $cache2->get('');
|
||||
$this->assertInternalType('string', $substorageCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($substorageCachedData['etag'], $cachedData['etag']);
|
||||
|
||||
$cachedData = $this->cache->get('folder');
|
||||
$this->assertInternalType('string', $folderCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($folderCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertEquals($time, $cachedData['mtime']);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,328 @@
|
|||
<?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\Cache;
|
||||
|
||||
use \OC\Files\Filesystem as Filesystem;
|
||||
use OC\Files\Storage\Temporary;
|
||||
|
||||
class UpdaterLegacy extends \PHPUnit_Framework_TestCase {
|
||||
/**
|
||||
* @var \OC\Files\Storage\Storage $storage
|
||||
*/
|
||||
private $storage;
|
||||
|
||||
/**
|
||||
* @var \OC\Files\Cache\Scanner $scanner
|
||||
*/
|
||||
private $scanner;
|
||||
|
||||
private $stateFilesEncryption;
|
||||
|
||||
/**
|
||||
* @var \OC\Files\Cache\Cache $cache
|
||||
*/
|
||||
private $cache;
|
||||
|
||||
private static $user;
|
||||
|
||||
public function setUp() {
|
||||
|
||||
// remember files_encryption state
|
||||
$this->stateFilesEncryption = \OC_App::isEnabled('files_encryption');
|
||||
// we want to tests with the encryption app disabled
|
||||
\OC_App::disable('files_encryption');
|
||||
|
||||
$this->storage = new \OC\Files\Storage\Temporary(array());
|
||||
$textData = "dummy file data\n";
|
||||
$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png');
|
||||
$this->storage->mkdir('folder');
|
||||
$this->storage->file_put_contents('foo.txt', $textData);
|
||||
$this->storage->file_put_contents('foo.png', $imgData);
|
||||
$this->storage->file_put_contents('folder/bar.txt', $textData);
|
||||
$this->storage->file_put_contents('folder/bar2.txt', $textData);
|
||||
|
||||
$this->scanner = $this->storage->getScanner();
|
||||
$this->scanner->scan('');
|
||||
$this->cache = $this->storage->getCache();
|
||||
|
||||
\OC\Files\Filesystem::tearDown();
|
||||
if (!self::$user) {
|
||||
self::$user = uniqid();
|
||||
}
|
||||
|
||||
\OC_User::createUser(self::$user, 'password');
|
||||
\OC_User::setUserId(self::$user);
|
||||
|
||||
\OC\Files\Filesystem::init(self::$user, '/' . self::$user . '/files');
|
||||
|
||||
Filesystem::clearMounts();
|
||||
Filesystem::mount($this->storage, array(), '/' . self::$user . '/files');
|
||||
|
||||
\OC_Hook::clear('OC_Filesystem');
|
||||
}
|
||||
|
||||
public function tearDown() {
|
||||
if ($this->cache) {
|
||||
$this->cache->clear();
|
||||
}
|
||||
$result = \OC_User::deleteUser(self::$user);
|
||||
$this->assertTrue($result);
|
||||
Filesystem::tearDown();
|
||||
// reset app files_encryption
|
||||
if ($this->stateFilesEncryption) {
|
||||
\OC_App::enable('files_encryption');
|
||||
}
|
||||
}
|
||||
|
||||
public function testWrite() {
|
||||
$textSize = strlen("dummy file data\n");
|
||||
$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
|
||||
$this->cache->put('foo.txt', array('mtime' => 100, 'storage_mtime' => 150));
|
||||
$rootCachedData = $this->cache->get('');
|
||||
$this->assertEquals(3 * $textSize + $imageSize, $rootCachedData['size']);
|
||||
|
||||
$fooCachedData = $this->cache->get('foo.txt');
|
||||
Filesystem::file_put_contents('foo.txt', 'asd');
|
||||
$cachedData = $this->cache->get('foo.txt');
|
||||
$this->assertEquals(3, $cachedData['size']);
|
||||
$this->assertInternalType('string', $fooCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($fooCachedData['etag'], $cachedData['etag']);
|
||||
$cachedData = $this->cache->get('');
|
||||
$this->assertEquals(2 * $textSize + $imageSize + 3, $cachedData['size']);
|
||||
$this->assertInternalType('string', $rootCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
|
||||
$rootCachedData = $cachedData;
|
||||
|
||||
$this->assertFalse($this->cache->inCache('bar.txt'));
|
||||
Filesystem::file_put_contents('bar.txt', 'asd');
|
||||
$this->assertTrue($this->cache->inCache('bar.txt'));
|
||||
$cachedData = $this->cache->get('bar.txt');
|
||||
$this->assertEquals(3, $cachedData['size']);
|
||||
$mtime = $cachedData['mtime'];
|
||||
$cachedData = $this->cache->get('');
|
||||
$this->assertEquals(2 * $textSize + $imageSize + 2 * 3, $cachedData['size']);
|
||||
$this->assertInternalType('string', $rootCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $mtime);
|
||||
}
|
||||
|
||||
public function testWriteWithMountPoints() {
|
||||
$storage2 = new \OC\Files\Storage\Temporary(array());
|
||||
$storage2->getScanner()->scan(''); //initialize etags
|
||||
$cache2 = $storage2->getCache();
|
||||
Filesystem::mount($storage2, array(), '/' . self::$user . '/files/folder/substorage');
|
||||
$folderCachedData = $this->cache->get('folder');
|
||||
$substorageCachedData = $cache2->get('');
|
||||
Filesystem::file_put_contents('folder/substorage/foo.txt', 'asd');
|
||||
$this->assertTrue($cache2->inCache('foo.txt'));
|
||||
$cachedData = $cache2->get('foo.txt');
|
||||
$this->assertEquals(3, $cachedData['size']);
|
||||
$mtime = $cachedData['mtime'];
|
||||
|
||||
$cachedData = $cache2->get('');
|
||||
$this->assertInternalType('string', $substorageCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($substorageCachedData['etag'], $cachedData['etag']);
|
||||
|
||||
$cachedData = $this->cache->get('folder');
|
||||
$this->assertInternalType('string', $folderCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($folderCachedData['etag'], $cachedData['etag']);
|
||||
}
|
||||
|
||||
public function testDelete() {
|
||||
$textSize = strlen("dummy file data\n");
|
||||
$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
|
||||
$rootCachedData = $this->cache->get('');
|
||||
$this->assertEquals(3 * $textSize + $imageSize, $rootCachedData['size']);
|
||||
|
||||
$this->assertTrue($this->cache->inCache('foo.txt'));
|
||||
Filesystem::unlink('foo.txt');
|
||||
$this->assertFalse($this->cache->inCache('foo.txt'));
|
||||
$cachedData = $this->cache->get('');
|
||||
$this->assertEquals(2 * $textSize + $imageSize, $cachedData['size']);
|
||||
$this->assertInternalType('string', $rootCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']);
|
||||
$rootCachedData = $cachedData;
|
||||
|
||||
Filesystem::mkdir('bar_folder');
|
||||
$this->assertTrue($this->cache->inCache('bar_folder'));
|
||||
$cachedData = $this->cache->get('');
|
||||
$this->assertInternalType('string', $rootCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
|
||||
$rootCachedData = $cachedData;
|
||||
Filesystem::rmdir('bar_folder');
|
||||
$this->assertFalse($this->cache->inCache('bar_folder'));
|
||||
$cachedData = $this->cache->get('');
|
||||
$this->assertInternalType('string', $rootCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']);
|
||||
}
|
||||
|
||||
public function testDeleteWithMountPoints() {
|
||||
$storage2 = new \OC\Files\Storage\Temporary(array());
|
||||
$cache2 = $storage2->getCache();
|
||||
Filesystem::mount($storage2, array(), '/' . self::$user . '/files/folder/substorage');
|
||||
Filesystem::file_put_contents('folder/substorage/foo.txt', 'asd');
|
||||
$this->assertTrue($cache2->inCache('foo.txt'));
|
||||
$folderCachedData = $this->cache->get('folder');
|
||||
$substorageCachedData = $cache2->get('');
|
||||
Filesystem::unlink('folder/substorage/foo.txt');
|
||||
$this->assertFalse($cache2->inCache('foo.txt'));
|
||||
|
||||
$cachedData = $cache2->get('');
|
||||
$this->assertInternalType('string', $substorageCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($substorageCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertGreaterThanOrEqual($substorageCachedData['mtime'], $cachedData['mtime']);
|
||||
|
||||
$cachedData = $this->cache->get('folder');
|
||||
$this->assertInternalType('string', $folderCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($folderCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertGreaterThanOrEqual($folderCachedData['mtime'], $cachedData['mtime']);
|
||||
}
|
||||
|
||||
public function testRename() {
|
||||
$textSize = strlen("dummy file data\n");
|
||||
$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
|
||||
$rootCachedData = $this->cache->get('');
|
||||
$this->assertEquals(3 * $textSize + $imageSize, $rootCachedData['size']);
|
||||
|
||||
$this->assertTrue($this->cache->inCache('foo.txt'));
|
||||
$fooCachedData = $this->cache->get('foo.txt');
|
||||
$this->assertFalse($this->cache->inCache('bar.txt'));
|
||||
Filesystem::rename('foo.txt', 'bar.txt');
|
||||
$this->assertFalse($this->cache->inCache('foo.txt'));
|
||||
$this->assertTrue($this->cache->inCache('bar.txt'));
|
||||
$cachedData = $this->cache->get('bar.txt');
|
||||
$this->assertEquals($fooCachedData['fileid'], $cachedData['fileid']);
|
||||
$mtime = $cachedData['mtime'];
|
||||
$cachedData = $this->cache->get('');
|
||||
$this->assertEquals(3 * $textSize + $imageSize, $cachedData['size']);
|
||||
$this->assertInternalType('string', $rootCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
|
||||
}
|
||||
|
||||
public function testRenameExtension() {
|
||||
$fooCachedData = $this->cache->get('foo.txt');
|
||||
$this->assertEquals('text/plain', $fooCachedData['mimetype']);
|
||||
Filesystem::rename('foo.txt', 'foo.abcd');
|
||||
$fooCachedData = $this->cache->get('foo.abcd');
|
||||
$this->assertEquals('application/octet-stream', $fooCachedData['mimetype']);
|
||||
}
|
||||
|
||||
public function testRenameWithMountPoints() {
|
||||
$storage2 = new \OC\Files\Storage\Temporary(array());
|
||||
$cache2 = $storage2->getCache();
|
||||
Filesystem::mount($storage2, array(), '/' . self::$user . '/files/folder/substorage');
|
||||
Filesystem::file_put_contents('folder/substorage/foo.txt', 'asd');
|
||||
$this->assertTrue($cache2->inCache('foo.txt'));
|
||||
$folderCachedData = $this->cache->get('folder');
|
||||
$substorageCachedData = $cache2->get('');
|
||||
$fooCachedData = $cache2->get('foo.txt');
|
||||
Filesystem::rename('folder/substorage/foo.txt', 'folder/substorage/bar.txt');
|
||||
$this->assertFalse($cache2->inCache('foo.txt'));
|
||||
$this->assertTrue($cache2->inCache('bar.txt'));
|
||||
$cachedData = $cache2->get('bar.txt');
|
||||
$this->assertEquals($fooCachedData['fileid'], $cachedData['fileid']);
|
||||
$mtime = $cachedData['mtime'];
|
||||
|
||||
$cachedData = $cache2->get('');
|
||||
$this->assertInternalType('string', $substorageCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($substorageCachedData['etag'], $cachedData['etag']);
|
||||
// rename can cause mtime change - invalid assert
|
||||
// $this->assertEquals($mtime, $cachedData['mtime']);
|
||||
|
||||
$cachedData = $this->cache->get('folder');
|
||||
$this->assertInternalType('string', $folderCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($folderCachedData['etag'], $cachedData['etag']);
|
||||
// rename can cause mtime change - invalid assert
|
||||
// $this->assertEquals($mtime, $cachedData['mtime']);
|
||||
}
|
||||
|
||||
public function testTouch() {
|
||||
$rootCachedData = $this->cache->get('');
|
||||
$fooCachedData = $this->cache->get('foo.txt');
|
||||
Filesystem::touch('foo.txt');
|
||||
$cachedData = $this->cache->get('foo.txt');
|
||||
$this->assertInternalType('string', $fooCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertGreaterThanOrEqual($fooCachedData['mtime'], $cachedData['mtime']);
|
||||
|
||||
$cachedData = $this->cache->get('');
|
||||
$this->assertInternalType('string', $rootCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']);
|
||||
$rootCachedData = $cachedData;
|
||||
|
||||
$time = 1371006070;
|
||||
$barCachedData = $this->cache->get('folder/bar.txt');
|
||||
$folderCachedData = $this->cache->get('folder');
|
||||
Filesystem::touch('folder/bar.txt', $time);
|
||||
$cachedData = $this->cache->get('folder/bar.txt');
|
||||
$this->assertInternalType('string', $barCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($barCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertEquals($time, $cachedData['mtime']);
|
||||
|
||||
$cachedData = $this->cache->get('folder');
|
||||
$this->assertInternalType('string', $folderCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($folderCachedData['etag'], $cachedData['etag']);
|
||||
|
||||
$cachedData = $this->cache->get('');
|
||||
$this->assertInternalType('string', $rootCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertEquals($time, $cachedData['mtime']);
|
||||
}
|
||||
|
||||
public function testTouchWithMountPoints() {
|
||||
$storage2 = new \OC\Files\Storage\Temporary(array());
|
||||
$cache2 = $storage2->getCache();
|
||||
Filesystem::mount($storage2, array(), '/' . self::$user . '/files/folder/substorage');
|
||||
Filesystem::file_put_contents('folder/substorage/foo.txt', 'asd');
|
||||
$this->assertTrue($cache2->inCache('foo.txt'));
|
||||
$folderCachedData = $this->cache->get('folder');
|
||||
$substorageCachedData = $cache2->get('');
|
||||
$fooCachedData = $cache2->get('foo.txt');
|
||||
$cachedData = $cache2->get('foo.txt');
|
||||
$time = 1371006070;
|
||||
Filesystem::touch('folder/substorage/foo.txt', $time);
|
||||
$cachedData = $cache2->get('foo.txt');
|
||||
$this->assertInternalType('string', $fooCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($fooCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertEquals($time, $cachedData['mtime']);
|
||||
|
||||
$cachedData = $cache2->get('');
|
||||
$this->assertInternalType('string', $substorageCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($substorageCachedData['etag'], $cachedData['etag']);
|
||||
|
||||
$cachedData = $this->cache->get('folder');
|
||||
$this->assertInternalType('string', $folderCachedData['etag']);
|
||||
$this->assertInternalType('string', $cachedData['etag']);
|
||||
$this->assertNotSame($folderCachedData['etag'], $cachedData['etag']);
|
||||
$this->assertEquals($time, $cachedData['mtime']);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -382,7 +382,7 @@ class View extends \PHPUnit_Framework_TestCase {
|
|||
$rootView->putFileInfo('foo.txt', array('storage_mtime' => 1000)); //make sure the watcher detects the change
|
||||
$rootView->file_put_contents('foo.txt', 'asd');
|
||||
$cachedData = $rootView->getFileInfo('foo.txt');
|
||||
$this->assertGreaterThanOrEqual($cachedData['mtime'], $oldCachedData['mtime']);
|
||||
$this->assertGreaterThanOrEqual($oldCachedData['mtime'], $cachedData['mtime']);
|
||||
$this->assertEquals($cachedData['storage_mtime'], $cachedData['mtime']);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue