cache user folders
This commit is contained in:
parent
b2d365734a
commit
2693ae870e
|
@ -28,6 +28,7 @@
|
||||||
|
|
||||||
namespace OC\Files\Node;
|
namespace OC\Files\Node;
|
||||||
|
|
||||||
|
use OC\Cache\CappedMemoryCache;
|
||||||
use OC\Files\Mount\Manager;
|
use OC\Files\Mount\Manager;
|
||||||
use OC\Files\Mount\MountPoint;
|
use OC\Files\Mount\MountPoint;
|
||||||
use OCP\Files\NotFoundException;
|
use OCP\Files\NotFoundException;
|
||||||
|
@ -71,6 +72,8 @@ class Root extends Folder implements IRootFolder {
|
||||||
*/
|
*/
|
||||||
private $user;
|
private $user;
|
||||||
|
|
||||||
|
private $userFolderCache;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param \OC\Files\Mount\Manager $manager
|
* @param \OC\Files\Mount\Manager $manager
|
||||||
* @param \OC\Files\View $view
|
* @param \OC\Files\View $view
|
||||||
|
@ -81,6 +84,7 @@ class Root extends Folder implements IRootFolder {
|
||||||
$this->mountManager = $manager;
|
$this->mountManager = $manager;
|
||||||
$this->user = $user;
|
$this->user = $user;
|
||||||
$this->emitter = new PublicEmitter();
|
$this->emitter = new PublicEmitter();
|
||||||
|
$this->userFolderCache = new CappedMemoryCache();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -335,6 +339,7 @@ class Root extends Folder implements IRootFolder {
|
||||||
* @return \OCP\Files\Folder
|
* @return \OCP\Files\Folder
|
||||||
*/
|
*/
|
||||||
public function getUserFolder($userId) {
|
public function getUserFolder($userId) {
|
||||||
|
if (!$this->userFolderCache->hasKey($userId)) {
|
||||||
\OC\Files\Filesystem::initMountPoints($userId);
|
\OC\Files\Filesystem::initMountPoints($userId);
|
||||||
$dir = '/' . $userId;
|
$dir = '/' . $userId;
|
||||||
$folder = null;
|
$folder = null;
|
||||||
|
@ -352,8 +357,13 @@ class Root extends Folder implements IRootFolder {
|
||||||
$folder = $folder->newFolder($dir);
|
$folder = $folder->newFolder($dir);
|
||||||
\OC_Util::copySkeleton($userId, $folder);
|
\OC_Util::copySkeleton($userId, $folder);
|
||||||
}
|
}
|
||||||
|
$this->userFolderCache->set($userId, $folder);
|
||||||
|
}
|
||||||
|
|
||||||
return $folder;
|
return $this->userFolderCache->get($userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function clearCache() {
|
||||||
|
$this->userFolderCache = new CappedMemoryCache();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -356,6 +356,7 @@ class OC_Util {
|
||||||
*/
|
*/
|
||||||
public static function tearDownFS() {
|
public static function tearDownFS() {
|
||||||
\OC\Files\Filesystem::tearDown();
|
\OC\Files\Filesystem::tearDown();
|
||||||
|
\OC::$server->getRootFolder()->clearCache();
|
||||||
self::$fsSetup = false;
|
self::$fsSetup = false;
|
||||||
self::$rootMounted = false;
|
self::$rootMounted = false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,6 +24,7 @@ namespace Test;
|
||||||
|
|
||||||
use DOMDocument;
|
use DOMDocument;
|
||||||
use DOMNode;
|
use DOMNode;
|
||||||
|
use OC\Cache\CappedMemoryCache;
|
||||||
use OC\Command\QueueBus;
|
use OC\Command\QueueBus;
|
||||||
use OC\Files\Filesystem;
|
use OC\Files\Filesystem;
|
||||||
use OC\Template\Base;
|
use OC\Template\Base;
|
||||||
|
|
Loading…
Reference in New Issue