Skip to content

FileStorage: Create subdirs when using the method derive #33

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FileStorage: Create subdirs when using the method derive #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/Caching/Storages/FileStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public function lock($key)
{
$cacheFile = $this->getCacheFile($key);
if ($this->useDirs && !is_dir($dir = dirname($cacheFile))) {
@mkdir($dir); // @ - directory may already exist
@mkdir($dir, 0777, true); // @ - directory may already exist
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not thread safe.
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about this solution? - http://stackoverflow.com/questions/15356189/creating-a-directory-from-multiple-threads/21626808#21626808
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@milo What problem it can cause?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dg Let's say only a dir/ exists and 1st thread is creating dir/aaa/bbb/ and 2nd dir/aaa/ccc/. When they start in the same time, 1st creates dir/aaa/ and 2nd tries too. 1st is success and continues to create dir/aaa/bbb/ but 2nd fails and ends, so dir/aaa/ccc/ does not exist.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recalled nette/nette@0e23c0a
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@milo thanx!

Btw, FileStorage is using only one level of directories, isn't it? So this PR is not needed.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dg Imho, purpose is that $cache->derive('a')->derive('b')->derive('c')->save('key', 'val'); will create tmp/_a/_b/_c, now it creates tmp/_%00a%00b%00c.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now I see!
}
$handle = fopen($cacheFile, 'c+b');
if ($handle) {
Expand Down Expand Up @@ -365,8 +365,11 @@ protected function readData($meta)
protected function getCacheFile($key)
{
$file = urlencode($key);
if ($this->useDirs && $a = strrpos($file, '%00')) { // %00 = urlencode(Nette\Caching\Cache::NAMESPACE_SEPARATOR)
$file = substr_replace($file, '/_', $a, 3);
if ($this->useDirs) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about $file = str_replace('%00', '/_', $file);
$a = 0;
while ($a = strrpos($file, '%00', -$a)) { // %00 = urlencode(Nette\Caching\Cache::NAMESPACE_SEPARATOR)
$file = substr_replace($file, '/_', $a, 3);
}
}
return $this->dir . '/_' . $file;
}
Expand Down