Skip to content

Already pass size difference to the cache updater to avoid calculation of the folder size to update #28310

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

Closed
juliusknorr wants to merge 4 commits into from
Closed

Already pass size difference to the cache updater to avoid calculation of the folder size to update #28310

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9fc985b
Already pass size difference to the cache updater to avoid full calcu…
juliusknorr Jul 29, 2021
59275e2
Make written byte counter variable name more obvious
juliusknorr Aug 5, 2021
834d081
Ensure to only update size if available
juliusknorr Sep 2, 2021
cc7c467
Pass size difference for mkdir/file_put_content operations to speed u…
juliusknorr Sep 2, 2021
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
Pass size difference for mkdir/file_put_content operations to speed u… 
…p correcting the folder size

Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Dec 22, 2022
commit cc7c4679a4b4948825ac20f018629c3e51e07ea4
14 changes: 10 additions & 4 deletions lib/private/Files/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
use OC\Files\Storage\Storage;
use OC\User\LazyUser;
use OC\Share\Share;
use OC\User\User;
use OCA\Files_Sharing\SharedMount;
use OCP\Constants;
use OCP\Files\Cache\ICacheEntry;
Expand Down Expand Up @@ -316,12 +315,12 @@ public function enableCacheUpdate() {
$this->updaterEnabled = true;
}

protected function writeUpdate(Storage $storage, $internalPath, $time = null) {
protected function writeUpdate(Storage $storage, $internalPath, $time = null, $size = null) {
if ($this->updaterEnabled) {
if (is_null($time)) {
$time = time();
}
$storage->getUpdater()->update($internalPath, $time);
$storage->getUpdater()->update($internalPath, $time, $size);
}
}

Expand Down Expand Up @@ -1175,6 +1174,7 @@ private function basicOperation($operation, $path, $hooks = [], $extraParam = nu
$this->unlockFile($path, ILockingProvider::LOCK_SHARED);
throw $e;
}
$previousSize = $storage->filesize($internalPath);
}
try {
if (!is_null($extraParam)) {
Expand All @@ -1195,7 +1195,13 @@ private function basicOperation($operation, $path, $hooks = [], $extraParam = nu
$this->removeUpdate($storage, $internalPath);
}
if ($result !== false && in_array('write', $hooks, true) && $operation !== 'fopen' && $operation !== 'touch') {
$this->writeUpdate($storage, $internalPath);
$size = null;
if ($operation === 'mkdir') {
$size = 0;
} elseif ($operation === 'file_put_contents' && isset($previousSize)) {
$size = $result - $previousSize;
}
$this->writeUpdate($storage, $internalPath, null, $size);
}
if ($result !== false && in_array('touch', $hooks)) {
$this->writeUpdate($storage, $internalPath, $extraParam);
Expand Down