Skip to content
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

8293121: (fs) Refactor UnixFileSystem copying into generic Unix, Linux, and BSD implementations #10093

Closed
wants to merge 4 commits into from

Conversation

bplb
Copy link
Member

@bplb bplb commented Aug 31, 2022

Refactor UnixFileSystem and related classes to move implementations specific to Linux and BSD (macOS) into OS-specific classes and native code. Generic Unix implementations remain in existing Unix* files.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8293121: (fs) Refactor UnixFileSystem copying into generic Unix, Linux, and BSD implementations

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/10093/head:pull/10093
$ git checkout pull/10093

Update a local copy of the PR:
$ git checkout pull/10093
$ git pull https://git.openjdk.org/jdk pull/10093/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10093

View PR using the GUI difftool:
$ git pr show -t 10093

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/10093.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 31, 2022

👋 Welcome back bpb! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 31, 2022
@openjdk
Copy link

openjdk bot commented Aug 31, 2022

@bplb The following label will be automatically applied to this pull request:

  • nio

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.

@openjdk openjdk bot added the nio nio-dev@openjdk.org label Aug 31, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 31, 2022

Webrevs

@AlanBateman
Copy link
Contributor

The refactoring means there is a 1-1 relationship between UnixFileSystem and a state-less UnixFileCopy. If you just move the methods to UnixFileSystem then it will give you the framework to add Linux overrides to LinuxFileSystem and macOS/BSD overrides to BsdFileSystem. That would avoid needing to create a parallel hierarchy of classes just to support copy/move.

@bplb
Copy link
Member Author

bplb commented Aug 31, 2022

If you just move the methods to UnixFileSystem then it will give you the framework to add Linux overrides to LinuxFileSystem and macOS/BSD overrides to BsdFileSystem.

I was hesitant to add so much code to UnixFileSystem but it does seem logical.

@AlanBateman
Copy link
Contributor

I skimmed through the changes in be36c5a and this is a good refactor. I don't have time to do a detailed walk through right now but I'll get to that soon.

Copy link
Contributor

@AlanBateman AlanBateman left a comment

Choose a reason for hiding this comment

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

Overall I think the structure looks quite good. A lot of code has moved so it's hard to see what has changed so I focused on the copyFile and supporting methods as that seems to be where the only changes are.

test/jdk/java/nio/file/Files/CopyAndMove.java Outdated Show resolved Hide resolved
src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java Outdated Show resolved Hide resolved
Copy link
Contributor

@AlanBateman AlanBateman left a comment

Choose a reason for hiding this comment

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

Thanks for the updates, I don't have any comments/issues.

@bplb
Copy link
Member Author

bplb commented Sep 1, 2022

Thanks for the updates, I don't have any comments/issues.

Thanks for the review!

@openjdk
Copy link

openjdk bot commented Sep 1, 2022

@bplb 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:

8293121: (fs) Refactor UnixFileSystem copying into generic Unix, Linux, and BSD implementations

Reviewed-by: alanb

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 35 new commits pushed to the master branch:

  • 3d254d3: 8289510: Improve test coverage for XPath Axes: namespace
  • 2d18dda: 8173605: Remove support for source and target 1.7 option in javac
  • 7c2f299: 8293202: Document how to edit doc/testing, doc/building
  • 07616de: 8175382: clhsdb pmap should print the end addresses of the load modules
  • 9444a08: 8290709: Incorrect dominance error for unconditional pattern vs. null
  • 6a1b0b5: 8293154: TemporalQueries java doc error
  • 5204528: 8293201: Library detection in runtime/ErrorHandling/TestDwarf.java fails on some systems
  • 2d10d4f: 8291651: CleanerTest.java fails with "Cleanable was cleaned"
  • bd674dc: 8293163: G1: Rename G1HeapRegionAttr::is_humongous
  • 479795b: 8293164: Remove unimplemented Generation::print_heap_change
  • ... and 25 more: https://git.openjdk.org/jdk/compare/550e5d7822c13c3011a445db109aa47d90af7fa6...master

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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 1, 2022
@bplb
Copy link
Member Author

bplb commented Sep 1, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Sep 1, 2022

Going to push as commit 0a4d0ce.
Since your change was applied there have been 39 commits pushed to the master branch:

  • 032be16: 8292066: Convert TestInputArgument.sh and TestSystemLoadAvg.sh to java version
  • e393973: 8292990: Improve test coverage for XPath Axes: parent
  • fa68371: 8292584: assert(cb != __null) failed: must be with -XX:-Inline
  • 04d8069: 8230374: maxOutputSize, instead of javatest.maxOutputSize, should be used in TEST.properties
  • 3d254d3: 8289510: Improve test coverage for XPath Axes: namespace
  • 2d18dda: 8173605: Remove support for source and target 1.7 option in javac
  • 7c2f299: 8293202: Document how to edit doc/testing, doc/building
  • 07616de: 8175382: clhsdb pmap should print the end addresses of the load modules
  • 9444a08: 8290709: Incorrect dominance error for unconditional pattern vs. null
  • 6a1b0b5: 8293154: TemporalQueries java doc error
  • ... and 29 more: https://git.openjdk.org/jdk/compare/550e5d7822c13c3011a445db109aa47d90af7fa6...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 1, 2022
@openjdk openjdk bot closed this Sep 1, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 1, 2022
@openjdk
Copy link

openjdk bot commented Sep 1, 2022

@bplb Pushed as commit 0a4d0ce.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@bplb bplb deleted the UnixFileSystem-refactor-8293121 branch September 2, 2022 14:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated nio nio-dev@openjdk.org
2 participants