[BEAM-171] Fix JAXBCoder in the nested context #116
Closed
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
JAXBCoder in the nested context is broken with any coder that writes content after the output of the XML stream, as decode will read the entire remaining stream and fail. In the nested context, prepend a long representing the size of the XML while encoding, and limit the size of the returned stream while decoding.
Member
Author
|
R: @dhalperi |
| } | ||
| if (context.equals(Context.NESTED)) { | ||
| CountingOutputStream countingStream = | ||
| new CountingOutputStream( |
| @Override | ||
| public void close() { | ||
| // Do nothing. JAXB closes the underyling stream so we must filter out those calls. | ||
|
|
Contributor
There was a problem hiding this comment.
remove newline.
Also, I was wrong about flush -- no need to flush an input stream (duh)
4 tasks
| jaxbUnmarshaller.unmarshal( | ||
| new CloseIgnoringInputStream(ByteStreams.limit(inStream, limit))); | ||
| return obj; | ||
| } |
Contributor
There was a problem hiding this comment.
how about extracting the common core for simplicity?
InputStream stream = inStream;
if (!context.isWholeStream) {
long limit = VarInt.decodeLong();
stream = ByteStreams.limit(stream, limit);
}
@SuppressWarnings("unchecked")
T obj = (T) jaxbUnmarshaller.unmarshal(new CloseIgnoringInputStream(stream));
return obj;
Contributor
|
beam issue? |
|
|
||
| @Override | ||
| public void close() { | ||
| // Do nothing. JAXB closes the underyling stream so we must filter out those calls. |
tgroh
changed the title
| new FilterOutputStream(outStream) { | ||
| // JAXB closes the underlying stream so we must filter out those calls. | ||
| @Override | ||
| public void close() throws IOException {} |
Contributor
There was a problem hiding this comment.
this one needs the flush, I think. It's an output stream.
Contributor
There was a problem hiding this comment.
This one should be backported.
Also, why separate out CloseIgnoringInputStream but not CloseIgnoringOutputStream?
Member
Author
There was a problem hiding this comment.
An artifact of the implementation.
Member
Author
|
Stopped flushing, as discussed, as the marshaller must have already written its contents to the stream before closed, and the stream will be flushed and closed by the actual owner. |
Contributor
|
LGTM, merging |
mareksimunek
pushed a commit
to mareksimunek/beam
that referenced
this pull request
May 9, 2018
#! Prevent deleting wrong timers
pl04351820
pushed a commit
to pl04351820/beam
that referenced
this pull request
Dec 20, 2023
* chore: update minimum version of protoplus to ensure DatetimeWithNanoseconds availability * feat: Incorporate nanoseconds back into components, such as hashing * blacken * remove unused imports
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Be sure to do all of the following to help us incorporate your contribution
quickly and easily:
[BEAM-<Jira issue #>] Description of pull requestmvn clean verify. (Even better, enableTravis-CI on your fork and ensure the whole test matrix passes).
number, if there is one.
Individual Contributor License Agreement.
JAXBCoder in the nested context is broken with any coder that writes
content after the output of the XML stream, as decode will read the
entire remaining stream and fail.
In the nested context, prepend a long representing the size of the XML
while encoding, and limit the size of the returned stream while
decoding.
Replaces #112
This should not be ported to the DataflowJavaSDK