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

8328316: Finisher cannot emit if stream is sequential and integrator returned false #18351

Closed
wants to merge 3 commits into from

Conversation

viktorklang-ora
Copy link
Contributor

@viktorklang-ora viktorklang-ora commented Mar 18, 2024

Adds differentiation between direct and transitive short circuiting which could prevent pushing downstream in the finisher for built-ins that were not collect().

Creating this as a draft PR for now, just need to run some benchmarks to validate no significant regressions first.


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-8328316: Finisher cannot emit if stream is sequential and integrator returned false (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18351

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 18, 2024

👋 Welcome back vklang! 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.

@viktorklang-ora
Copy link
Contributor Author

Just a note to self, consider if this should get backported to 22 or not.

@openjdk
Copy link

openjdk bot commented Mar 18, 2024

@viktorklang-ora 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:

8328316: Finisher cannot emit if stream is sequential and integrator returned false

Reviewed-by: psandoz

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

  • cc5cda5: 8328005: Convert java/awt/im/JTextFieldTest.java applet test to main
  • ef2bd57: 8328558: Convert javax/swing/JCheckBox/8032667/bug8032667.java applet test to main
  • e66788c: 8325179: Race in BasicDirectoryModel.validateFileCache
  • 1496b5d: 8327924: Simplify TrayIconScalingTest.java
  • 16ed191: 8328101: Parallel: Obsolete ParallelOldDeadWoodLimiterMean and ParallelOldDeadWoodLimiterStdDev
  • 581b1e2: 8328402: Implement pausing functionality for the PassFailJFrame
  • 75195aa: 8328299: Convert DnDFileGroupDescriptor.html applet test to main
  • 725d87b: 8328570: Convert closed JViewport manual applet tests to main
  • e41bc42: 8327990: [macosx-aarch64] Various tests fail with -XX:+AssertWXAtThreadSync
  • 4308017: 8328631: Convert java/awt/InputMethods/InputMethodsTest/InputMethodsTest.java applet test to manual
  • ... and 38 more: https://git.openjdk.org/jdk/compare/f1c69ccadb83306d1bb4860ff460a253af99643c...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 Mar 18, 2024

@viktorklang-ora The following label will be automatically applied to this pull request:

  • core-libs

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 core-libs core-libs-dev@openjdk.org label Mar 18, 2024
@viktorklang-ora viktorklang-ora marked this pull request as ready for review March 20, 2024 20:20
@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 20, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 20, 2024

Webrevs

@viktorklang-ora
Copy link
Contributor Author

@PaulSandoz Would you mind reviewing this PR, Paul?

Copy link
Member

@PaulSandoz PaulSandoz 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, just a minor suggestion.

test/jdk/java/util/stream/GathererShortCircuitTest.java Outdated Show resolved Hide resolved
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 20, 2024
@openjdk
Copy link

openjdk bot commented Mar 20, 2024

@viktorklang-ora Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

Co-authored-by: Paul Sandoz <paul.d.sandoz@googlemail.com>
@viktorklang-ora
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 21, 2024

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

  • ba05c6d: 8328368: Convert java/awt/image/multiresolution/MultiDisplayTest/MultiDisplayTest.java applet test to main
  • fa823bd: 8328540: test javax/swing/JSplitPane/4885629/bug4885629.java fails on windows hidpi
  • e81374e: 8328560: java/awt/event/MouseEvent/ClickDuringKeypress/ClickDuringKeypress.java imports Applet
  • cc5cda5: 8328005: Convert java/awt/im/JTextFieldTest.java applet test to main
  • ef2bd57: 8328558: Convert javax/swing/JCheckBox/8032667/bug8032667.java applet test to main
  • e66788c: 8325179: Race in BasicDirectoryModel.validateFileCache
  • 1496b5d: 8327924: Simplify TrayIconScalingTest.java
  • 16ed191: 8328101: Parallel: Obsolete ParallelOldDeadWoodLimiterMean and ParallelOldDeadWoodLimiterStdDev
  • 581b1e2: 8328402: Implement pausing functionality for the PassFailJFrame
  • 75195aa: 8328299: Convert DnDFileGroupDescriptor.html applet test to main
  • ... and 41 more: https://git.openjdk.org/jdk/compare/f1c69ccadb83306d1bb4860ff460a253af99643c...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 21, 2024

@viktorklang-ora Pushed as commit ab28045.

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

@mjustin
Copy link

mjustin commented Apr 1, 2024

Just a note to self, consider if this should get backported to 22 or not.

Have you decided whether this will be backported to 22?

@viktorklang-ora
Copy link
Contributor Author

/backport jdk22u

@openjdk
Copy link

openjdk bot commented Apr 2, 2024

@viktorklang-ora the backport was successfully created on the branch backport-viktorklang-ora-ab28045d in my personal fork of openjdk/jdk22u. To create a pull request with this backport targeting openjdk/jdk22u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit ab28045d from the openjdk/jdk repository.

The commit being backported was authored by Viktor Klang on 21 Mar 2024 and was reviewed by Paul Sandoz.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22u:

$ git fetch https://github.com/openjdk-bots/jdk22u.git backport-viktorklang-ora-ab28045d:backport-viktorklang-ora-ab28045d
$ git checkout backport-viktorklang-ora-ab28045d
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22u.git backport-viktorklang-ora-ab28045d

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
3 participants