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

8252374: Add a new factory method to concatenate a sequence of BodyPublisher instances into a single publisher. #57

Closed
wants to merge 15 commits into from

Conversation

@dfuch
Copy link
Member

@dfuch dfuch commented Sep 7, 2020

Continuing the review with a PR...

8252374: Add a new factory method to concatenate a sequence
of BodyPublisher instances into a single publisher.
https://bugs.openjdk.java.net/browse/JDK-8252374

Draft CSR:
https://bugs.openjdk.java.net/browse/JDK-8252382


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Testing

Linux x64 Windows x64 macOS x64
Build ✔️ (3/3 passed) ✔️ (2/2 passed) ✔️ (2/2 passed)
Test (tier1) ✔️ (9/9 passed) ✔️ (9/9 passed) ✔️ (9/9 passed)

Issue

  • JDK-8252374: Add a new factory method to concatenate a sequence of BodyPublisher instances into a single publisher.

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/57/head:pull/57
$ git checkout pull/57

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 7, 2020

👋 Welcome back dfuchs! 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 label Sep 7, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 7, 2020

@dfuch The following label will be automatically applied to this pull request: net.

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 (add|remove) "label" command.

@openjdk openjdk bot added the net label Sep 7, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 7, 2020

@ChrisHegarty
Copy link
Member

@ChrisHegarty ChrisHegarty commented Sep 7, 2020

/csr

@openjdk openjdk bot added the csr label Sep 7, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 7, 2020

@ChrisHegarty this pull request will not be integrated until the CSR request JDK-8252382 for issue JDK-8252374 has been approved.

@ChrisHegarty
Copy link
Member

@ChrisHegarty ChrisHegarty commented Sep 22, 2020

I added myself as reviewer on the CSR.

@openjdk openjdk bot removed the csr label Sep 29, 2020
@dfuch
Copy link
Member Author

@dfuch dfuch commented Oct 6, 2020

@ChrisHegarty As we discussed I have fixed the handling of negative requests, and hooked the publishers created by the new concat method to the TCK tests.

This made me realize that the AggregateSubscription should be checking its cancellation status more often to make it sure it's reported as soon as possible to the upstream publishers. Similarly I updated the PullPublisher to check its error state more often. The issue here is when the error/cancellation gets reported in the same thread in which the sequential scheduler is running, and when the upstream publisher is busily forwarding items until its demand is exhausted. If you had a single request() call with a high demand - then you do need to check the error/cancellation state before forwarding the next item - and not only after/before each request() call to the upstream publisher.

I also tweaked Demand to generate an IllegalArgumentException message that contains the (optional) message string expected by the TCK.

@openjdk
Copy link

@openjdk openjdk bot commented Oct 9, 2020

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

8252374: Add a new factory method to concatenate a sequence of BodyPublisher instances into a single publisher.

Reviewed-by: chegar

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

  • a2f6519: 8233685: Test tools/javac/modules/AddLimitMods.java fails
  • 70be8c7: 8253965: Delete the outdated java.awt.PeerFixer class
  • ced46b1: 8254190: [s390] interpreter misses exception check after calling monitorenter
  • 5351ba6: 8254262: jdk.test.lib.Utils::createTemp* don't pass attrs
  • 8c0d3d7: 8254195: java/nio/file/Files/SubstDrive.java failed with "AssertionError: expected [144951656448] but found [144951640064]"
  • c2a5de6: 8253681: closed java/awt/dnd/MouseEventAfterStartDragTest/MouseEventAfterStartDragTest.html test failed
  • d036dca: 8254103: Shenandoah: Move updating thread roots to concurrent phase
  • 7e82ba1: 8254146: Avoid unnecessary volatile write on new AtomicBoolean(false)
  • 6d13c76: 8253191: C2: Masked byte comparisons with large masks produce wrong result on x86
  • a191c58: 8253404: C2: assert(C->live_nodes() <= C->max_node_limit()) failed: Live Node limit exceeded limit
  • ... and 22 more: https://git.openjdk.java.net/jdk/compare/04ca660e81594fffc6975859bfb1770f21aeff26...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 label Oct 9, 2020
@dfuch
Copy link
Member Author

@dfuch dfuch commented Oct 12, 2020

/integrate

@openjdk openjdk bot closed this Oct 12, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 12, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Oct 12, 2020

@dfuch Since your change was applied there have been 72 commits pushed to the master branch:

  • 05459df: 8253765: C2: Control randomization in StressLCM and StressGCM
  • 6620b61: 8254573: Shenandoah: Streamline/inline native-LRB entry point
  • a6c23b7: 8253923: C2 doesn't always run loop opts for compilations that include loops
  • dfe8ba6: 8254320: Shenandoah: C2 native LRB should activate for non-cset objects
  • 295a44a: 8254558: Remove unimplemented Arguments::do_pd_flag_adjustments
  • 0fab73e: 8254560: Shenandoah: Concurrent Strong Roots logging is incorrect
  • 638f910: 8254559: Remove unimplemented JVMFlag::get_locked_message_ext
  • 0ec1d63: 8253117: Replace HTML tables in javadoc summaries with CSS grid elements
  • 54bbe76: 8251544: CTW: C2 fails with assert(no_dead_loop) failed: dead loop detected
  • 13fe054: 8253588: C1: assert(false) failed: unknown register on x86_32 only with -XX:+TraceLinearScanLevel=4
  • ... and 62 more: https://git.openjdk.java.net/jdk/compare/04ca660e81594fffc6975859bfb1770f21aeff26...master

Your commit was automatically rebased without conflicts.

Pushed as commit 4184959.

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

@dfuch dfuch deleted the concat-bs-8252374 branch Oct 12, 2020
cushon pushed a commit to cushon/jdk that referenced this issue Apr 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants