Dry up inputstream to bytesreference #43675
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
Member
original-brownbear
commented
Jun 27, 2019
original-brownbear
commented
- Dry up spots where we use the same pattern to get from an InputStream to a BytesReferences
* Dry up spots where we use the same pattern to get from an InputStream to a BytesReferences
original-brownbear
added
>non-issue
:Core/Infra/Core
|
Pinging @elastic/es-core-infra |
tlrx
reviewed
Jul 2, 2019
| throw e; | ||
| } | ||
| // EMPTY is safe here because RepositoryData#fromXContent calls namedObject | ||
| final BytesReference out = Streams.readFully(blobContainer().readBlob(snapshotsIndexBlobName)); |
There was a problem hiding this comment.
I don't think we need to fully read the blob here. Instead we could pass the InputStream directly to the XContentParser and let the blob containter bufferizes the reads?
| repositoryData = repositoryData.incompatibleSnapshotsFromXContent(parser); | ||
| } | ||
| try (XContentParser parser = XContentHelper.createParser(NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, | ||
| Streams.readFully(blobContainer().readBlob(INCOMPATIBLE_SNAPSHOTS_BLOB)), XContentType.JSON)) { |
| Streams.copy(blob, out); | ||
| return Numbers.bytesToLong(out.bytes().toBytesRef()); | ||
| } | ||
| return Numbers.bytesToLong(Streams.readFully(blobContainer().readBlob(INDEX_LATEST_BLOB)).toBytesRef()); |
There was a problem hiding this comment.
We expect this file to be very small so using Streams.readFully()can makes sense here.
| out.bytes(), XContentType.JSON)) { | ||
| repositoryData = RepositoryData.snapshotsFromXContent(parser, latestGen); | ||
| } | ||
| try (XContentParser parser = XContentHelper.createParser(NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, |
|
Thanks @tlrx I moved to directly deserializing in the spots you pointed out now :) |
tlrx
reviewed
Jul 2, 2019
server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
Show resolved
Hide resolved
|
Jenkins run elasticsearch-ci/packaging-sample |
|
Jenkins run elasticsearch-ci/2 |
|
thanks @tlrx ! (packaging sample is just red because of the build stats cluster being down -> merging) |
original-brownbear
added
backport pending
v7.4.0
and removed
v7.3.0
v7.4.0
backport pending
labels
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Jul 9, 2019
* Dry up Reading InputStream to BytesReference * Dry up spots where we use the same pattern to get from an InputStream to a BytesReferences
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.