-
-
Notifications
You must be signed in to change notification settings - Fork 44
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.
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
FileStorage: Create subdirs when using the method derive #33
Open
radoslavius
wants to merge
1
commit into
nette:master
Choose a base branch
from
radoslavius:master
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
} | ||
$handle = fopen($cacheFile, 'c+b'); | ||
if ($handle) { | ||
|
@@ -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) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What about |
||
$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; | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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 creatingdir/aaa/bbb/
and 2nddir/aaa/ccc/
. When they start in the same time, 1st createsdir/aaa/
and 2nd tries too. 1st is success and continues to createdir/aaa/bbb/
but 2nd fails and ends, sodir/aaa/ccc/
does not exist.There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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 createtmp/_a/_b/_c
, now it createstmp/_%00a%00b%00c
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now I see!