Bug fix: Facilitate second retrieval of the same value (#134770) #134790
+103
−15
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
gmarouli
added
:Core/Infra/Core
elasticsearchmachine
added
Team:Core/Infra
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
|
Hi @gmarouli, I've created a changelog YAML for you. |
martijnvg
reviewed
Sep 16, 2025
...impl/src/test/java/org/elasticsearch/xcontent/provider/json/ESUTF8StreamJsonParserTests.java
Outdated
Show resolved
Hide resolved
ldematte
reviewed
Sep 16, 2025
| - match: | ||
| hits.hits.0._source.foo: "c:\\windows\\system32\\svchost.exe" | ||
|
|
||
| - do: |
There was a problem hiding this comment.
If possible, I'd add a comment here pointing to the bug issue, so it's immediately clear why we are calling this twice (a future dev might be tempted to "clean up" things and remove the second call)
ldematte
approved these changes
Sep 16, 2025
| var text = parser.getValueAsText(); | ||
| assertThat(text, Matchers.notNullValue()); | ||
| assertTextRef(text.bytes(), "bar\"baz\""); | ||
| // Retrieve the value for a second time to ensure the last value is available |
There was a problem hiding this comment.
Would make it sense to test the reset of the lastOptimizedValue too? e.g. calling nextFieldName/nextToken + getValueAsText and ensure the content is not stale?
jordan-powers
approved these changes
Sep 16, 2025
| // Retrieve the value for a second time to ensure the last value is available | ||
| text = parser.getValueAsText(); | ||
| assertThat(text, Matchers.notNullValue()); | ||
| assertTextRef(text.bytes(), "bar\"baz\""); |
There was a problem hiding this comment.
You might consider updating testGetValueRandomized() to also double-retrieve the value from the parser.
martijnvg
approved these changes
Sep 16, 2025
gmarouli
added
the
auto-merge-without-approval
💔 Backport failed
You can use sqren/backport to manually backport by running |
This was referenced Sep 17, 2025
gmjehovich
pushed a commit
to gmjehovich/elasticsearch
that referenced
this pull request
Sep 18, 2025
… (elastic#134790) In this PR we attempt to fix elastic#134770, we have identified the issue at the retrieval of the field value for the second time in order to populate the keyword multi-field. We noticed that when the we performed the second retrieval it was not using the recently optimised value, but the value of the initial buffer. We added a new variable that "remembers" the optimised value and allows us to reuse it.
gmarouli
added a commit
that referenced
this pull request
Sep 29, 2025
…lue. (#135184) In #134790 we introduced a bug that was caught by our tests.; The problem manifested itself when a multi field mapper would call `getText()` which would set `_tokenIncomplete` to `false` after the `getOptimisedText()`. This would evaluate the condition `_currToken == JsonToken.VALUE_STRING && _tokenIncomplete && stringEnd > 0` to false and the `lastOptimisedValue` would not be reset. We changed the code to always reset the `lastOptimisedValue` when a `next*()` method is called. Furthermore, we introduced a randomised unit test that creates two `XContentParsers` and runs one as a baseline using none of the optimised code and the other one is accessing both optimised and non optimised in a random pattern. This test was able to catch both #134770 & #135256. Fixes #135256
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
In this PR we attempt to fix #134770, we have identified the issue at the retrieval of the field value for the second time in order to populate the keyword multi-field.
We noticed that when the we performed the second retrieval it was not using the recently optimised value, but the value of the initial buffer. We added a new variable that "remembers" the optimised value and allows us to reuse it.