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

8327046: (fs) Files.walk should be clear that depth-first traversal is pre-order #18063

Closed
wants to merge 4 commits into from

Conversation

pavelrappo
Copy link
Member

@pavelrappo pavelrappo commented Feb 29, 2024

Please review this clarification to the specification of the two overloads of java.nio.file.Files.walk. No tests are added, as I believe the existing StreamTest.testWalk* methods already test the order sufficiently. I also took this opportunity to fix a few minor typos.


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-8327046: (fs) Files.walk should be clear that depth-first traversal is pre-order (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18063

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 29, 2024

👋 Welcome back prappo! 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 Feb 29, 2024
@openjdk
Copy link

openjdk bot commented Feb 29, 2024

@pavelrappo 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 Feb 29, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 29, 2024

Webrevs

@AlanBateman
Copy link
Contributor

Your proposed wording is okay but it makes me wonder if we now need to define "pre-order" as it is new term here. An alternative is something like this:

"The file tree traversal is depth-first with a directory visited before the entries in the directory."

which will align it closely to the existing wording in walkFileTree and FileVisitor.

@pavelrappo
Copy link
Member Author

You are right. Although in-order, pre-order and post-order are all well-known terms, there are no occurrences of them in the java.base API documentation. Fixed closely to what you proposed; please examine 5ffccf3.

@openjdk
Copy link

openjdk bot commented Feb 29, 2024

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

8327046: (fs) Files.walk should be clear that depth-first traversal is pre-order

Reviewed-by: alanb, gli

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

  • a065eba: 8326496: [test] checkHsErrFileContent support printing hserr in error case
  • 0899b3b: 8326612: Parallel: remove redundant assertion from ScavengeRootsTask
  • 12404a5: 8324790: ifnode::fold_compares_helper cleanup
  • 0d35450: 8327040: Problemlist ActionListenerCalledTwiceTest.java test failing in macos14
  • 8d6f784: 8327056: Remove unused static char array in JvmtiAgentList::lookup
  • 43af120: 8326959: Improve JVMCI option help
  • 742c776: 8322743: C2: prevent lock region elimination in OSR compilation
  • d29cefb: 8326838: JFR: Native mirror events
  • b8fc418: 8326525: com/sun/tools/attach/BasicTests.java does not verify AgentLoadException case
  • d9aa1de: 8318605: Enable parallelism in vmTestbase/nsk/stress/stack tests
  • ... and 3 more: https://git.openjdk.org/jdk/compare/430290066c23d09166a84f2f6f89e770c6ba04ff...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 Feb 29, 2024
Copy link
Member

@lgxbslgx lgxbslgx left a comment

Choose a reason for hiding this comment

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

A trivial issue about the name.

test/jdk/java/nio/file/Files/StreamTest.java Outdated Show resolved Hide resolved
Copy link
Member

@lgxbslgx lgxbslgx left a comment

Choose a reason for hiding this comment

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

Looks good.

@pavelrappo
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 1, 2024

Going to push as commit 012411a.
Since your change was applied there have been 19 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 1, 2024

@pavelrappo Pushed as commit 012411a.

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

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
Development

Successfully merging this pull request may close these issues.

3 participants