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

dfuch · 2020-09-07T13:54:52Z

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

Chris Hegarty (@ChrisHegarty - Reviewer)

Download

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

…blisher instances into a single publisher.

bridgekeeper · 2020-09-07T13:56:29Z

👋 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 · 2020-09-07T13:57:33Z

@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.

mlbridge · 2020-09-07T14:00:54Z

Webrevs

ChrisHegarty · 2020-09-07T14:04:47Z

/csr

openjdk · 2020-09-07T14:05:17Z

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

src/java.net.http/share/classes/java/net/http/HttpRequest.java

ChrisHegarty · 2020-09-22T08:49:37Z

I added myself as reviewer on the CSR.

src/java.net.http/share/classes/jdk/internal/net/http/RequestPublishers.java

…he TCK tests.

dfuch · 2020-10-06T17:51:32Z

@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.

src/java.net.http/share/classes/jdk/internal/net/http/PullPublisher.java

openjdk · 2020-10-09T08:16:07Z

@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.

dfuch · 2020-10-12T12:52:08Z

/integrate

openjdk · 2020-10-12T12:53:15Z

@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.

Fix printing.

* Update LICENSE file * The experimental version is aimed to refactor the tool * verificationType mistakenly added to source code is renamed to type * Adapted mvn bindings to at8 * Added tests to represent bad stream handling in jdec and correctone in jdis * Made jdec to write output to proper toolOutput instead of bad logOutput * 7903208: [Jasm] Add support for generics (the Signature attribute) * 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs * Replaced hardcoded String[] args, by varargs String... where reasonable Once the "tool" mandatory array memebr was removed from each tool's main method, and considering calls from libraries, and form tests where the argument is very often just one file, or more readable "a1", a2"... without new String[]{} declaration, changed those String[] enforcing headers to more benevolent String... * Intentionally removed ACC_SUPER class modifier was causing hotswap to fail When jasm's disasm, modify, asm cycle output binary was used for class hotswap, remote JDK was not accepting it with java.lang.UnsupportedOperationException: class redefinition failed: attempted to change the class modifiers beacuse of ommited supoer keyword (although it have already no real reason) This patch is returning the kwyword without conditions, when it was included in original bytecode * extended test to verify that super is not used always if super is not in source code, then it is not in disambled code * 7903248: jasm: FieldData.ConstantValue holds undefined reference to CP while writing fields to a class * Added support for stdin in jdis * stdin is now read also by jasm,jcod,jdec more tests needed * Removed jdis specific missleading provide method * Tool output moved where it belongs to commons * Removed duplicated declaration of ArrayList<ToolInput> fileList * Changed requireNonNull message in getDataInputStream * Added one more abstraction layer providing highly reusable byte[] based input * Properly exiting after verson is printed * Stream based inputs are now drained once needed, not during construction * reworked stdin read to be initiated by - As a side effect, files and stdin can be read together remove dduplicated code in tests by getting class in compile time added tests and adapted older to new behavior * added tests if asmtools assmble itself into valid bytecode Added two set of tests jdec->jcoder->load jdis->jasm->load Both in two variants, with -g, and without Both jdec->jcoder->load works fine Both jdis->jasm->load now fails on three files from 278: /org/openjdk/asmtools/jasm/JasmEnvironment$InputFile.class, /org/openjdk/asmtools/jcoder/Jcoder.class, /org/openjdk/asmtools/jasm/Parser.class Fail looks valid. Unluckily, the issue where -g disassembled and back assembled com.google.gson.Gson produce invalid bytecode was not hit The class BruteForceHelper is reusable for any set of classes * Naive fix for enforced dot.suffix * repalce stdout by configurable object This checkout is not buildable, but server as showcase for issue with dual logging for compilers * Replaced dualstream logger by wrapper so it can be later made fully customisable * Enabled shared i18n properties via reused asmtools/i18n.props * All four tools now use neww ToolOutput output As a consequence, all four tools by by default prints to stdout, and honours -d properly * Fixed typo which casued behavior regression found by unittests * Refatoed tests so they can harbour resources in maven way * Moved all logging to stderr. use -dls to return original behavior The -dls switch is oging to be removed once stderr is properl adapted * Implemented library-like input and output This commit is adding byte[]/String input/output clasases for direct library usage. Added tests, advertising how simple is usage of those inputs/outputs There are two hunks, which fixes issues ovberlooked in previous refactorings: - traceln now correctly calls getOutputs - jdec now uses proper logger insted of accidental stderr * Enabled -g for jcoder to be set from external code * Temporary workaround around tests being order-sensitive As -g is now making some disassmebld code not asemble-able back, and order of tests is not deterministic, and Options are static, thus if -g is now set in some test, it is not unset in other tests. Real fix is to move Options out of static context to context of environment as it is done for jcoder. * Added github actions Just for record for "act" for local testing. To run with podman based distros, several steps are ncessary. See nektos/act#303 ; especially * nektos/act#303 (comment) * and nektos/act#303 (comment) * the bind and socket eg: systemctl enable --now --user podman.socket systemctl start --user podman.socket export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/podman/podman.sock ../act/bin/act --bind --container-daemon-socket $XDG_RUNTIME_DIR/podman/podman.sock To rerun the build on clean env, you have to stop and start the podman socket again Without explicit 'mvn test' the tests are not running. Not sure why * 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs * Fixed issue when jasm produced only one file from source with multiple ones Added tests for this issue Added test veryfying that the jcoder is not affected * 7903401: jtreg fails if set of jdk tests process jasm,jdis files with defects * 7903402: jdis: tool writes incorrect StackMapTable if the first same_frame has type 0 (openjdk#51) * 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs * 7903401: jtreg fails if set of jdk tests process jasm,jdis files with defects * 7903402: jdis: tool writes incorrect StackMapTable if the first same_frame has type 0 * 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs * Refactored new ToolInput/Outputs so they reside in own packages and not in original interfaces (openjdk#53) * Refactored new ToolInput/Outputs so they reside in own packages and not in original interfaces * Removed unused imports * Added licence headers * Added ajvadoc description to three main interfaces. * Removed unnecessary guard condition before changging \ to / for fqn * Replaced "\n" by System.lineSeparator() * Used better names for highlighted abbrevations * 7903405: compiler does not warn about instruction arguments that exceed allowed limits (openjdk#54) * 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs * 7903401: jtreg fails if set of jdk tests process jasm,jdis files with defects * 7903402: jdis: tool writes incorrect StackMapTable if the first same_frame has type 0 * 7902888: Excess entries in BootstrapMethods with the same bsm, bsmKind, bsmArgs * 7903405: compiler does not warn about instruction arguments that exceed allowed limits * 7903405: compiler does not warn about instruction arguments that exceed allowed limits * Delete ToolOutput.java * Fixed junit test for CODETOOLS-7903405 (openjdk#56) * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 (openjdk#57) * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * Fix tabs * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 (Part II) (openjdk#58) * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * Fix tabs * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * CODETOOLS-7903506: Asmtools: jdis prints BootstrapMethod attribute if detailed output is off (openjdk#59) * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * Fix tabs * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * 7903506: Asmtools: jdis prints BootstrapMethod attribute if detailed output is off * 7903509: jcoder, jasm: add option to override class file version in source file(s) (openjdk#60) * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * Fix tabs * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * 7903509: jcoder, jasm: add option to override class file version in source file(s) * CODETOOLS-7903531: jdis: Suppress printing comments by adding an option (openjdk#61) * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * Fix tabs * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * 7903458: Umbrella: Preparations for switching to Asmtools 8.0 * 7903531: jdis: Suppress printing comments by adding an option --------- Co-authored-by: Jiri Vanek <jvanek@redhat.com>

8252374: Add a new factory method to concatenate a sequence of BodyPu…

79957a2

…blisher instances into a single publisher.

openjdk bot added the rfr Pull request is ready for review label Sep 7, 2020

openjdk bot added the net net-dev@openjdk.org label Sep 7, 2020

openjdk bot added the csr Pull request needs approved CSR before integration label Sep 7, 2020

dfuch added 3 commits September 10, 2020 16:56

Merge remote-tracking branch 'origin/master' into concat-bs-8252374

befc3ab

Merge remote-tracking branch 'origin/master' into concat-bs-8252374

d76633b

Merge remote-tracking branch 'origin/master' into concat-bs-8252374

dfbc646

ChrisHegarty reviewed Sep 18, 2020

View reviewed changes

dfuch added 2 commits September 18, 2020 13:54

Improved API documentation, added more tests for contentLength()

e68faf4

Improved the API documentation of BodyPublishers::concat

496c80d

openjdk bot removed the csr Pull request needs approved CSR before integration label Sep 29, 2020

ChrisHegarty suggested changes Oct 5, 2020

View reviewed changes

dfuch added 6 commits October 5, 2020 10:45

Incorporated review comments

6229ebe

Merge

63709bb

Added a test case for requesting a non positive number of items.

4b7436b

Merge

2346c69

Use a dataProvider for testNegativeRequest

c8c0768

Fixed handling of negative request. Added BodyPublishers::concat to t…

9719bf2

…he TCK tests.

ChrisHegarty reviewed Oct 7, 2020

View reviewed changes

src/java.net.http/share/classes/jdk/internal/net/http/PullPublisher.java Outdated Show resolved Hide resolved

dfuch added 3 commits October 7, 2020 11:55

Keep changes to PullPublisher for a later fix

85ab07a

Added a plain test for positive requests.

9cdee6e

Merge

9ff5a3b

ChrisHegarty approved these changes Oct 9, 2020

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Oct 9, 2020

openjdk bot closed this Oct 12, 2020

openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 12, 2020

dfuch deleted the concat-bs-8252374 branch October 12, 2020 12:53

cushon pushed a commit to cushon/jdk that referenced this pull request Apr 2, 2021

Add aliasing annotations (openjdk#57)

4891771

fisk pushed a commit to fisk/jdk that referenced this pull request Feb 18, 2022

Merge pull request openjdk#57 from coleenp/preempt

34277b5

Fix printing.

caojoshua added a commit to caojoshua/jdk that referenced this pull request Jul 26, 2023

[PEA] Convert Blender to jmh micro benchmark (openjdk#57)

658ce00

robehn pushed a commit to robehn/jdk that referenced this pull request Aug 15, 2023

Rename jdk-dbg package (openjdk#57)

89bf232

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

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

Uh oh!

Conversation

dfuch commented Sep 7, 2020 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Testing

Issue

Reviewers

Download

Uh oh!

bridgekeeper bot commented Sep 7, 2020

Uh oh!

openjdk bot commented Sep 7, 2020

Uh oh!

mlbridge bot commented Sep 7, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

ChrisHegarty commented Sep 7, 2020

Uh oh!

openjdk bot commented Sep 7, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ChrisHegarty commented Sep 22, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dfuch commented Oct 6, 2020

Uh oh!

Uh oh!

openjdk bot commented Oct 9, 2020

Uh oh!

dfuch commented Oct 12, 2020

Uh oh!

openjdk bot commented Oct 12, 2020

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

dfuch commented Sep 7, 2020 •

edited by openjdk bot

Loading

mlbridge bot commented Sep 7, 2020 •

edited

Loading