Fix AnalyzeAction response serialization #44284
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
Currently we loose information about whether a token list in an AnalyzeAction response is null or an empty list, because we write a 0 value to the stream in both cases and deserialize to a null value on the receiving side. This change fixes this so we write an additional flag indicating whether the value is null or not, followed by the size of the list and its content. Closes elastic#44078
cbuescher
added
>bug
:Search Relevance/Analysis
|
Pinging @elastic/es-search |
cbuescher
commented
Jul 12, 2019
| tokens = new ArrayList<>(size); | ||
| for (int i = 0; i < size; i++) { | ||
| tokens.add(new AnalyzeToken(in)); | ||
| if (in.getVersion().onOrAfter(Version.V_8_0_0)) { |
There was a problem hiding this comment.
I'd like to backport this to 7_3_0 at least if possible. Not sure of its feasible to 7_2_1, might complicate the whole backport story a bit.
romseygeek
approved these changes
Jul 12, 2019
server/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java
Outdated
Show resolved
Hide resolved
client/rest-high-level/src/test/java/org/elasticsearch/client/indices/AnalyzeResponseTests.java
Outdated
Show resolved
Hide resolved
client/rest-high-level/src/test/java/org/elasticsearch/client/indices/AnalyzeResponseTests.java
Outdated
Show resolved
Hide resolved
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import static org.hamcrest.Matchers.equalTo; | ||
|
|
||
| public class AnalyzeResponseTests extends ESTestCase { | ||
| public class AnalyzeResponseTests extends AbstractWireSerializingTestCase<AnalyzeAction.Response> { |
cbuescher
pushed a commit
that referenced
this pull request
Jul 14, 2019
Currently we loose information about whether a token list in an AnalyzeAction response is null or an empty list, because we write a 0 value to the stream in both cases and deserialize to a null value on the receiving side. This change fixes this so we write an additional flag indicating whether the value is null or not, followed by the size of the list and its content. Closes #44078
cbuescher
pushed a commit
that referenced
this pull request
Jul 14, 2019
Currently we loose information about whether a token list in an AnalyzeAction response is null or an empty list, because we write a 0 value to the stream in both cases and deserialize to a null value on the receiving side. This change fixes this so we write an additional flag indicating whether the value is null or not, followed by the size of the list and its content. Closes #44078
cbuescher
pushed a commit
that referenced
this pull request
Jul 14, 2019
Change AnalyzeAction response serialization version condition after #44284 has been backported
cbuescher
pushed a commit
to cbuescher/elasticsearch
that referenced
this pull request
Jul 15, 2019
Currently we loose information about whether a token list in an AnalyzeAction response is null or an empty list, because we write a 0 value to the stream in both cases and deserialize to a null value on the receiving side. This was fixed in elastic#44284 by a change in the serialization protocol starting in 7.3. However this PR fixes the symptoms without changing the wire protocol which we cannot to easily on 6.8 because we already released incompatible versions in the 7.x line. This change adds special handling on xcontent output and if getToken() is callled on either AnalyzeResponse or DetailedAnalyzeResponse to always return empty lists instead of null values. Relates to elastic#44078
cbuescher
pushed a commit
that referenced
this pull request
Jul 16, 2019
Currently we loose information about whether a token list in an AnalyzeAction response is null or an empty list, because we write a 0 value to the stream in both cases and deserialize to a null value on the receiving side. This was fixed in #44284 by a change in the serialization protocol starting in 7.3. However this PR fixes the symptoms without changing the wire protocol which we cannot to easily on 6.8 because we already released incompatible versions in the 7.x line. This change adds special handling on xcontent output and if getToken() is callled on either AnalyzeResponse or DetailedAnalyzeResponse to always return empty lists instead of null values. Relates to #44078
56 tasks
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.
Currently we loose information about whether a token list in an AnalyzeAction
response is null or an empty list, because we write a 0 value to the stream in
both cases and deserialize to a null value on the receiving side. This change
fixes this so we write an additional flag indicating whether the value is null
or not, followed by the size of the list and its content.
Closes #44078