Commit ee3cf1d
authored
Read InputStream bodies straight into the buffer, no staging array (#2233)
Motivation:
`InputStreamBodyGenerator.Body.transferTo` allocated a new `byte[]` on
every invocation, sized to the target `ByteBuf`'s writable region, then
read the `InputStream` into that array before copying the bytes into the
`ByteBuf`. This incurred both a per-chunk allocation and an unnecessary
copy. Additionally, the implementation reserved a 10-byte margin
(`writableBytes() - 10`), which could cause `NegativeArraySizeException`
or prematurely stop transfers when the target had 10 or fewer writable
bytes.
Modification:
`transferTo` now reads directly from the `InputStream` into the target
`ByteBuf` using `ByteBuf.writeBytes(InputStream, int)`, eliminating the
intermediate staging array, the extra copy, and the per-instance chunk
field.
The state machine is unchanged: each call performs a single stream read,
returns `CONTINUE` while data remains, and returns `STOP` at EOF or on
an I/O error (with logging unchanged). The legacy 10-byte writable
margin has been removed, allowing each transfer to use the full writable
capacity and correctly handle small writable regions.
Although AsyncHttpClient's internal request path uses
`NettyInputStreamBody`, this implementation remains part of the public
`InputStreamBodyGenerator.createBody()` API and is used by external
callers.
Result:
Reduces allocation and copy overhead during transfers, correctly
supports small writable buffers, preserves existing transfer semantics,
and adds tests covering multi-read transfers, single-read completion,
empty streams, and transfers through a 10-byte buffer. No public API
changes.1 parent 1a73921 commit ee3cf1d
2 files changed
Lines changed: 130 additions & 14 deletions
File tree
- client/src
- main/java/org/asynchttpclient/request/body/generator
- test/java/org/asynchttpclient/request/body/generator
Lines changed: 8 additions & 14 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | | - | |
62 | 61 | | |
63 | 62 | | |
64 | 63 | | |
| |||
72 | 71 | | |
73 | 72 | | |
74 | 73 | | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
81 | 79 | | |
82 | | - | |
| 80 | + | |
83 | 81 | | |
84 | 82 | | |
| 83 | + | |
85 | 84 | | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
| 85 | + | |
92 | 86 | | |
93 | 87 | | |
94 | 88 | | |
| |||
Lines changed: 122 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
0 commit comments