Skip to content

Improve performance when dealing with large numbers of shares #10724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 11 commits into from
Aug 24, 2018
Merged

Improve performance when dealing with large numbers of shares #10724

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9598181
remove double loop for detecting changed mounts
icewind1991 Aug 16, 2018
f8116ad
use more efficient method to find mountpoint for path
icewind1991 Aug 16, 2018
f7ae235
cache OC\Files\Mount\Manager::findIn results
icewind1991 Aug 16, 2018
3155c1b
more efficient unique share target generation
icewind1991 Aug 16, 2018
c300516
more efficient way to detect added and removed mounts
icewind1991 Aug 16, 2018
bc4f10a
more efficient way to detect added and removed mounts
icewind1991 Aug 16, 2018
b79f338
re-use view instances for shared storages
icewind1991 Aug 16, 2018
b5217b6
don't check if target dir exists when using the default share target …
icewind1991 Aug 16, 2018
720b27d
only determine is sharing is disabled for a user once
icewind1991 Aug 16, 2018
4c0cbdf
tokens can't be valid local user names
icewind1991 Aug 16, 2018
67f3d6f
cache parent exists status during share setup
icewind1991 Aug 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
only determine is sharing is disabled for a user once 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Aug 16, 2018
commit 720b27d60b330a4752366327ec2ee42e2899b3ec
4 changes: 3 additions & 1 deletion apps/files_sharing/lib/MountProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public function getMountsForUser(IUser $user, IStorageFactory $storageFactory) {
$mounts = [];
$view = new View('/' . $user->getUID() . '/files');
$ownerViews = [];
$sharingDisabledForUser = $this->shareManager->sharingDisabledForUser($user->getUID());
foreach ($superShares as $share) {
try {
/** @var \OCP\Share\IShare $parentShare */
Expand All @@ -104,7 +105,8 @@ public function getMountsForUser(IUser $user, IStorageFactory $storageFactory) {
'superShare' => $parentShare,
// children/component of the superShare
'groupedShares' => $share[1],
'ownerView' => $ownerViews[$owner]
'ownerView' => $ownerViews[$owner],
'sharingDisabledForUser' => $sharingDisabledForUser
],
$storageFactory,
$view
Expand Down
10 changes: 9 additions & 1 deletion apps/files_sharing/lib/SharedStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto

private $options;

/** @var boolean */
private $sharingDisabledForUser;

public function __construct($arguments) {
$this->ownerView = $arguments['ownerView'];
$this->logger = \OC::$server->getLogger();
Expand All @@ -87,6 +90,11 @@ public function __construct($arguments) {
$this->groupedShares = $arguments['groupedShares'];

$this->user = $arguments['user'];
if (isset($arguments['sharingDisabledForUser'])) {
$this->sharingDisabledForUser = $arguments['sharingDisabledForUser'];
} else {
$this->sharingDisabledForUser = false;
}

parent::__construct([
'storage' => null,
Expand Down Expand Up @@ -193,7 +201,7 @@ public function getPermissions($target = '') {
$permissions |= \OCP\Constants::PERMISSION_DELETE;
}

if (\OCP\Util::isSharingDisabledForUser()) {
if ($this->sharingDisabledForUser) {
$permissions &= ~\OCP\Constants::PERMISSION_SHARE;
}

Expand Down