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

8331189: Implementation of Scoped Values (Third Preview) #19136

Closed
wants to merge 7 commits into from

Conversation

AlanBateman
Copy link
Contributor

@AlanBateman AlanBateman commented May 8, 2024

JEP 481 proposes Scoped Values to continue to preview in JDK 23 with one change. The type of the operation parameter of the callWhere method is changed to a new functional interface to avoid having the API throw Exception. With that change, the getWhere (and the corresponding method on Carrier) are no longer needed. The functional interface is not proposed for j.u.function at this time.


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
  • Change requires CSR request JDK-8331190 to be approved

Issues

  • JDK-8331189: Implementation of Scoped Values (Third Preview) (Enhancement - P4)
  • JDK-8331190: Implementation of Scoped Values (Third Preview) (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19136

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 8, 2024

👋 Welcome back alanb! 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
Copy link

openjdk bot commented May 8, 2024

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

8331189: Implementation of Scoped Values (Third Preview)

Reviewed-by: aph, jpai, mcimadamore

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

  • 4acafb8: 8333107: javac fails with an exception when processing broken lambda
  • 921860d: 8333264: Remove unused resolve_sub_helper declaration after JDK-8322630
  • 4a20691: 8331876: JFR: Move file read and write events to java.base
  • f608918: 8332614: Type-checked ConstantPool.entryByIndex and ClassReader.readEntryOrNull
  • 1b04f64: 8216984: Deprecate for removal Socket constructors to create UDP sockets
  • 3cff588: 8332826: Make hashCode methods in ArraysSupport friendlier
  • 2b4a4b7: 8326121: vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_inMemoryCompilation_keep_cl failed with Full gc happened. Test was useless.
  • 286cc16: 8327401: Some jtreg tests fail on Wayland without any tracking bug
  • 579cf70: 8332597: Remove redundant methods from j.l.classfile.ClassReader API
  • 57bfd0e: 8332065: Calling readLine(null...) or readPassword(null...) on System.console() hangs jshell
  • ... and 7 more: https://git.openjdk.org/jdk/compare/43a2f17342af8f5bf1f5823df9fa0bf0bdfdfce2...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
Copy link

openjdk bot commented May 8, 2024

@AlanBateman The following labels will be automatically applied to this pull request:

  • client
  • compiler
  • core-libs
  • security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added security security-dev@openjdk.org client client-libs-dev@openjdk.org core-libs core-libs-dev@openjdk.org compiler compiler-dev@openjdk.org labels May 8, 2024
@AlanBateman AlanBateman changed the title Implementation of Scoped Values (Third Preview) 8331189: Implementation of Scoped Values (Third Preview) May 8, 2024
@AlanBateman
Copy link
Contributor Author

/label remove compiler
/label remove client
/label remove security

@openjdk openjdk bot added csr Pull request needs approved CSR before integration and removed compiler compiler-dev@openjdk.org labels May 8, 2024
@openjdk
Copy link

openjdk bot commented May 8, 2024

@AlanBateman
The compiler label was successfully removed.

@openjdk openjdk bot removed the client client-libs-dev@openjdk.org label May 8, 2024
@openjdk
Copy link

openjdk bot commented May 8, 2024

@AlanBateman
The client label was successfully removed.

@openjdk openjdk bot removed the security security-dev@openjdk.org label May 8, 2024
@openjdk
Copy link

openjdk bot commented May 8, 2024

@AlanBateman
The security label was successfully removed.

Copy link
Contributor

@theRealAph theRealAph left a comment

Choose a reason for hiding this comment

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

Thanks. That all looks reasonable enough, and gets us to the status quo ante + ScopedValue.CallableOp, which is way better than what we have right now.

@AlanBateman AlanBateman marked this pull request as ready for review May 21, 2024 08:27
@openjdk openjdk bot added the rfr Pull request is ready for review label May 21, 2024
@mlbridge
Copy link

mlbridge bot commented May 21, 2024

Webrevs

@@ -532,6 +490,24 @@ private void runWith(Snapshot newSnapshot, Runnable op) {
}
}

/**
* An operation that returns a result and may throw an exception.
Copy link
Member

Choose a reason for hiding this comment

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

Nit - should it be "or may throw an exception"?

Copy link
Member

@jaikiran jaikiran left a comment

Choose a reason for hiding this comment

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

The changes look OK to me.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 21, 2024
@openjdk openjdk bot removed the csr Pull request needs approved CSR before integration label May 21, 2024
Copy link
Contributor

@mcimadamore mcimadamore left a comment

Choose a reason for hiding this comment

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

Changes look good. I like how the new functional interface makes the API seem smaller.

@AlanBateman
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented May 30, 2024

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

  • 4acafb8: 8333107: javac fails with an exception when processing broken lambda
  • 921860d: 8333264: Remove unused resolve_sub_helper declaration after JDK-8322630
  • 4a20691: 8331876: JFR: Move file read and write events to java.base
  • f608918: 8332614: Type-checked ConstantPool.entryByIndex and ClassReader.readEntryOrNull
  • 1b04f64: 8216984: Deprecate for removal Socket constructors to create UDP sockets
  • 3cff588: 8332826: Make hashCode methods in ArraysSupport friendlier
  • 2b4a4b7: 8326121: vmTestbase/gc/g1/unloading/tests/unloading_keepRef_rootClass_inMemoryCompilation_keep_cl failed with Full gc happened. Test was useless.
  • 286cc16: 8327401: Some jtreg tests fail on Wayland without any tracking bug
  • 579cf70: 8332597: Remove redundant methods from j.l.classfile.ClassReader API
  • 57bfd0e: 8332065: Calling readLine(null...) or readPassword(null...) on System.console() hangs jshell
  • ... and 7 more: https://git.openjdk.org/jdk/compare/43a2f17342af8f5bf1f5823df9fa0bf0bdfdfce2...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 30, 2024

@AlanBateman Pushed as commit 7071542.

💡 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
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

5 participants