Fix BWC in match_only_text #130020
Merged
Fix BWC in match_only_text #130020
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
jordan-powers
added
>bug
auto-backport
Collaborator
|
Hi @jordan-powers, I've created a changelog YAML for you. |
jordan-powers
force-pushed
the
fix-bwc-match-only-text
branch
from
87260f6 to
33d2e3a
Compare
Collaborator
|
Hi @jordan-powers, I've created a changelog YAML for you. |
jordan-powers
force-pushed
the
fix-bwc-match-only-text
branch
from
6c0aacf to
a382ba6
Compare
Collaborator
|
Pinging @elastic/es-storage-engine (Team:StorageEngine) |
jordan-powers
force-pushed
the
fix-bwc-match-only-text
branch
from
0daf1c7 to
1d285b1
Compare
jordan-powers
removed
the
auto-backport
martijnvg
approved these changes
Jun 25, 2025
Member
martijnvg
left a comment
martijnvg
left a comment
There was a problem hiding this comment.
I left minor comments. These can be fixed in follow up
| if (stored instanceof BytesRef) { | ||
| return (BytesRef) stored; | ||
| } else { | ||
| return new BytesRef((String) stored); |
Member
There was a problem hiding this comment.
Suggested change
| return new BytesRef((String) stored); | |
| assert stored instances String | |
| return new BytesRef(stored.toString()); |
Member
There was a problem hiding this comment.
nit: maybe use BytesRefs#toBytesRef
Comment on lines
+389
to
+390
| if (stored instanceof BytesRef) { | ||
| return (BytesRef) stored; |
Member
There was a problem hiding this comment.
Suggested change
| if (stored instanceof BytesRef) { | |
| return (BytesRef) stored; | |
| if (stored instanceof BytesRef storedBytes) { | |
| return storedBytes; |
Member
There was a problem hiding this comment.
nit: Maybe use BytesRefs#toString
| @Override | ||
| protected void write(XContentBuilder b, Object value) throws IOException { | ||
| b.value(((BytesRef) value).utf8ToString()); | ||
| if (value instanceof BytesRef) { |
| } | ||
| } | ||
|
|
||
| public static class BytesFromMixedStringsBytesRefBlockLoader extends StoredFieldsBlockLoader { |
Member
There was a problem hiding this comment.
If this can be moved to mapper-extras module then we can make this package protected and control its usage. Given that normally this class shouldn't be used. It just now a workaround for a bwc bug.
breskeby
approved these changes
Jun 25, 2025
Contributor
Author
|
2 checks are failing: |
jordan-powers
merged commit 99ee7ab
into
elastic:patch/serverless-fix
23 of 27 checks passed
jordan-powers
added a commit
that referenced
this pull request
Jun 26, 2025
This brings in the fixes from #130020, with minor fixes to address review nits from that PR. Co-authored-by: Martijn van Groningen <[email protected]>
jordan-powers
added a commit
to jordan-powers/elasticsearch
that referenced
this pull request
Jun 26, 2025
This brings in the fixes from elastic#130020, with minor fixes to address review nits from that PR. Co-authored-by: Martijn van Groningen <[email protected]>
elasticsearchmachine
pushed a commit
that referenced
this pull request
Jun 27, 2025
* Pull match_only_text fixes into main (#130049) This brings in the fixes from #130020, with minor fixes to address review nits from that PR. Co-authored-by: Martijn van Groningen <[email protected]> (cherry picked from commit 40a7d02) # Conflicts: # qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/MatchOnlyTextRollingUpgradeIT.java * Fix base class of MatchOnlyTextRollingUpgradeIT * Add missing assumption to MatchOnlyTextRollingUpgradeIT
smalyshev
pushed a commit
to smalyshev/elasticsearch
that referenced
this pull request
Jun 27, 2025
This brings in the fixes from elastic#130020, with minor fixes to address review nits from that PR. Co-authored-by: Martijn van Groningen <[email protected]>
elasticsearchmachine
pushed a commit
that referenced
this pull request
Jun 27, 2025
This brings in the fixes from #130020, with minor fixes to address review nits from that PR. Co-authored-by: Martijn van Groningen <[email protected]>
mridula-s109
pushed a commit
to mridula-s109/elasticsearch
that referenced
this pull request
Jul 3, 2025
This brings in the fixes from elastic#130020, with minor fixes to address review nits from that PR. Co-authored-by: Martijn van Groningen <[email protected]>
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.
This patch updates places that expect the match_only_text stored field to be stored as a BytesRef to instead perform an instanceof check and see if it's a string or BytesRef.