8314569: (fs) Improve normalization of UnixPath for input with trailing slashes #15342
Conversation
|
👋 Welcome back stsypanov! A progress list of the required criteria for merging this PR into |
|
@stsypanov The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
|
How often is the only normalization the removal of a trailing "/"? It seems quite likely. |
The most common case is probably no duplicate or trailing slash, in which case this code won't be executed. The next most common is probably the trailing slash case, in which I think you have a good point, just need to be careful not to break the "/" case. |
|
@AlanBateman isn't "/" case handled in lines 108-109? |
I think Roger's suggestion means that the trailing case would be handled in normalizeAndCheck. There are many ways to do this, we just need to keep it maintainable. |
|
Updated the PR. Checked cases for normal path (requires no normalization) and root: @BenchmarkMode(Mode.AverageTime)
@OutputTimeUnit(TimeUnit.NANOSECONDS)
@Warmup(time = 2, iterations = 5)
@Measurement(time = 2, iterations = 5)
@Fork(value = 4, jvmArgs = "-Xmx1g")
public class FileToPathBenchmark {
@Benchmark
public Path toDirectoryPath(Data data) {
return FileSystems.getDefault().getPath(data.directoryPath);
}
@Benchmark
public Path toDirectoryPathDoubleSlash(Data data) {
return FileSystems.getDefault().getPath(data.directoryPathWithDoubleSlash);
}
@Benchmark
public Path toNormalPath(Data data) {
return FileSystems.getDefault().getPath(data.normalPath);
}
@Benchmark
public Path toRootPath(Data data) {
return FileSystems.getDefault().getPath(data.rootPath);
}
@State(Scope.Thread)
public static class Data {
private final String rootPath = "/";
private final String normalPath = "/tmp/tmp/tmp";
private final String directoryPath = "/tmp/tmp/tmp/";
private final String directoryPathWithDoubleSlash = "/tmp//tmp/tmp/";
}
}Results: |
Co-authored-by: ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
openjdk
bot
changed the title
|
@stsypanov This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 89 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@AlanBateman, @bplb, @RogerRiggs) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
|
/integrate |
|
@stsypanov |
openjdk
bot
removed
sponsor
|
@stsypanov The title on the PR is currently: "(fs) Improve normalization of UnixPath for directories(fs) Improve normalization of UnixPath for input with trailing slashes #15342" Something got fat fingered somewhere. Can you fix it to match the JBS issue "(fs) Improve normalization of UnixPath for input with trailing slashes" and then we can sponsor? |
stsypanov
changed the title
|
@AlanBateman done |
openjdk
bot
added
sponsor
|
/sponsor |
|
Going to push as commit 93188bd.
Your commit was automatically rebased without conflicts. |
openjdk
bot
removed
ready
|
@AlanBateman @stsypanov Pushed as commit 93188bd. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Avoiding
String.substring()call inUnixPath.normalize()can significantly reduce normalization costs for directories on Linux:Results:
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/15342/head:pull/15342$ git checkout pull/15342Update a local copy of the PR:
$ git checkout pull/15342$ git pull https://git.openjdk.org/jdk.git pull/15342/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 15342View PR using the GUI difftool:
$ git pr show -t 15342Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/15342.diff
Webrev
Link to Webrev Comment