Fix Azure InputStream#read method #96034
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Pinging @elastic/es-distributed (Team:Distributed) |
|
Hi @fcofdez, I've created a changelog YAML for you. |
| @@ -714,7 +714,14 @@ private ByteBuf copyBuffer(ByteBuffer buffer) { | |||
| @Override | |||
| public int read() throws IOException { | |||
| byte[] b = new byte[1]; | |||
| return read(b, 0, 1); | |||
| var bytesRead = read(b, 0, 1); | |||
| if (bytesRead > 0) { | |||
There was a problem hiding this comment.
Should it return strictly 1 byte?
There was a problem hiding this comment.
I would suggest then to make the first condition == to surface the issue with exception if more returned (out of paranoia)
idegtiarenko
approved these changes
May 11, 2023
henningandersen
approved these changes
May 11, 2023
| container.writeBlob(blobName, new ByteArrayInputStream(data), data.length, true); | ||
| try (var inputStream = container.readBlob(blobName)) { | ||
| for (byte blobByte : data) { | ||
| assertThat(blobByte, is(equalTo((byte) inputStream.read()))); |
There was a problem hiding this comment.
One detail here: can we expand blobByte instead of narrowing the result of inputStream.read()? That would validate the & 0xff works correctly.
Suggested change
| assertThat(blobByte, is(equalTo((byte) inputStream.read()))); | |
| assertThat((int) blobByte, is(equalTo(inputStream.read()))); |
| for (byte blobByte : data) { | ||
| assertThat(blobByte, is(equalTo((byte) inputStream.read()))); | ||
| } | ||
| } |
There was a problem hiding this comment.
Can we add:
assertThat(inputStream.read(), is(equalTo(-1)))
|
Thanks for the reviews! |
fcofdez
added a commit
to fcofdez/elasticsearch
that referenced
this pull request
May 11, 2023
fcofdez
added a commit
that referenced
this pull request
May 12, 2023
fcofdez
added a commit
that referenced
this pull request
May 12, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.