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

reuse the known rootinfo in the shared cache when possible

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2016-11-17 11:48:29 +01:00
parent de983e61e3
commit 30e7c27d86
No known key found for this signature in database
GPG key ID: 425003AC385454C5
4 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
apps/files_sharing/lib/Cache.php
View file

@ -57,6 +57,8 @@ class Cache extends CacheJail {
*/
private $sourceCache;
private $rootUnchanged = true;
/**
* @param \OCA\Files_Sharing\SharedStorage $storage
* @param IStorage $sourceStorage
@ -81,6 +83,33 @@ class Cache extends CacheJail {
}
}
public function get($file) {
if ($this->rootUnchanged && ($file === '' || $file === $this->sourceRootInfo->getId())) {
return $this->formatCacheEntry(clone $this->sourceRootInfo);
}
return parent::get($file);
}
public function update($id, array $data) {
$this->rootUnchanged = false;
parent::update($id, $data);
}
public function insert($file, array $data) {
$this->rootUnchanged = false;
return parent::insert($file, $data);
}
public function remove($file) {
$this->rootUnchanged = false;
parent::remove($file);
}
public function moveFromCache(\OCP\Files\Cache\ICache $sourceCache, $sourcePath, $targetPath) {
$this->rootUnchanged = false;
return parent::moveFromCache($sourceCache, $sourcePath, $targetPath);
}
protected function formatCacheEntry($entry) {
$path = isset($entry['path']) ? $entry['path'] : '';
$entry = parent::formatCacheEntry($entry);

2
apps/files_sharing/lib/SharedPropagator.php
View file

@ -39,6 +39,6 @@ class SharedPropagator extends Propagator {
public function propagateChange($internalPath, $time, $sizeDifference = 0) {
/** @var \OC\Files\Storage\Storage $storage */
list($storage, $sourceInternalPath) = $this->storage->resolvePath($internalPath);
return $storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference);
$storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference);
}
}

6
apps/files_sharing/lib/SharedStorage.php
View file

@ -311,6 +311,9 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
}
public function getCache($path = '', $storage = null) {
if ($this->cache) {
return $this->cache;
}
$this->init();
if (is_null($this->storage) || $this->storage instanceof FailedStorage) {
return new FailedCache(false);
@ -318,7 +321,8 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
if (!$storage) {
$storage = $this;
}
return new \OCA\Files_Sharing\Cache($storage, $this->storage, $this->sourceRootInfo);
$this->cache = new \OCA\Files_Sharing\Cache($storage, $this->storage, $this->sourceRootInfo);
return $this->cache;
}
public function getScanner($path = '', $storage = null) {

3
lib/private/Files/Cache/Wrapper/CacheJail.php
View file

@ -27,6 +27,7 @@
namespace OC\Files\Cache\Wrapper;
use OC\Files\Cache\Cache;
use OCP\Files\Cache\ICacheEntry;
/**
* Jail to a subdirectory of the wrapped cache
@ -73,7 +74,7 @@ class CacheJail extends CacheWrapper {
}
/**
* @param array $entry
* @param ICacheEntry|array $entry
* @return array
*/
protected function formatCacheEntry($entry) {