Fix serialization bug in painless execute api request #36075
Merged
Conversation
This file contains 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
The `xContentType` was incorrectly serialized: `xContentType.mediaTypeWithoutParameters()` was used to serialize, but `xContentType.mediaType()` was used to de-serialize. Also the serialization test class did not test `ContextSetup` well, this was due to limitation in serialization test base class. Changed the test class to manually test xcontent serialization, so that for both binary and xcontent serialization tests, the `ContextSetup` is properly tested. Closes elastic#36050
martijnvg
added
>bug
:Core/Infra/Scripting
|
Pinging @elastic/es-core-infra |
martijnvg
commented
Nov 29, 2018
| } | ||
|
|
||
| @Override | ||
| public void writeTo(StreamOutput out) throws IOException { | ||
| out.writeOptionalString(index); | ||
| out.writeOptionalBytesReference(document); | ||
| out.writeOptionalString(xContentType != null ? xContentType.mediaType(): null); | ||
| out.writeOptionalString(xContentType != null ? xContentType.mediaTypeWithoutParameters(): null); |
There was a problem hiding this comment.
This line fixes the bug reported in #36050. The rest of this change is to improve testing for the painless execute api request serialization.
martijnvg
added a commit
that referenced
this pull request
Nov 30, 2018
The `xContentType` was incorrectly serialized: `xContentType.mediaTypeWithoutParameters()` was used to serialize, but `xContentType.mediaType()` was used to de-serialize. Also the serialization test class did not test `ContextSetup` well, this was due to limitation in serialization test base class. Changed the test class to manually test xcontent serialization, so that for both binary and xcontent serialization tests, the `ContextSetup` is properly tested. Closes #36050
martijnvg
added a commit
that referenced
this pull request
Nov 30, 2018
The `xContentType` was incorrectly serialized: `xContentType.mediaTypeWithoutParameters()` was used to serialize, but `xContentType.mediaType()` was used to de-serialize. Also the serialization test class did not test `ContextSetup` well, this was due to limitation in serialization test base class. Changed the test class to manually test xcontent serialization, so that for both binary and xcontent serialization tests, the `ContextSetup` is properly tested. Closes #36050
codebrain
reviewed
May 24, 2019
modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessExecuteAction.java
Show resolved
Hide resolved
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.
The
xContentTypewas incorrectly serialized:xContentType.mediaTypeWithoutParameters()was used to serialize, butxContentType.mediaType()was used to de-serialize.Also the serialization test class did not test
ContextSetupwell,this was due to limitation in serialization test base class. Changed the
test class to manually test xcontent serialization, so that for both binary
and xcontent serialization tests, the
ContextSetupis properly tested.Closes #36050