Pull match_only_text fixes into main #130049
Merged
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
Fix class cast issue in bwc for match_only_text fields. Co-authored-by: Martijn van Groningen <[email protected]>
jordan-powers
added
>non-issue
auto-backport
martijnvg
reviewed
Jun 26, 2025
...per-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java
Outdated
Show resolved
Hide resolved
Co-authored-by: Martijn van Groningen <[email protected]>
Collaborator
|
Pinging @elastic/es-storage-engine (Team:StorageEngine) |
martijnvg
reviewed
Jun 26, 2025
| @Override | ||
| public BlockLoader blockLoader(BlockLoaderContext blContext) { | ||
| if (textFieldType.isSyntheticSource()) { | ||
| return new BlockStoredFieldsReader.BytesFromBytesRefsBlockLoader(storedFieldNameForSyntheticSource()); |
Member
There was a problem hiding this comment.
Before I forget. In a follow up, let's add index version for this? So that we can only use BytesFromMixedStringsBytesRefBlockLoader when we need to and otherwise use BlockStoredFieldsReader.BytesFromBytesRefsBlockLoader.
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]>
Collaborator
💔 Backport failed
You can use sqren/backport to manually backport by running |
Contributor
Author
💚 All backports created successfully
Questions ?Please refer to the Backport tool documentation |
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]>
jordan-powers
added a commit
to jordan-powers/elasticsearch
that referenced
this pull request
Jul 2, 2025
…lastic#130363) Follow-up to elastic#130049 to gate using the binary format for the stored field in match_only_text fields behind an index version.
elasticsearchmachine
pushed a commit
that referenced
this pull request
Jul 2, 2025
…ormat (#130363) (#130416) * Add index version for match_only_text stored field in binary format (#130363) Follow-up to #130049 to gate using the binary format for the stored field in match_only_text fields behind an index version. (cherry picked from commit a69c484) # Conflicts: # server/src/main/java/org/elasticsearch/index/IndexVersions.java * Fix IndexVersion in testLoadSyntheticSourceFromStringOrBytesRef * Trigger build for auto-merge
mridula-s109
pushed a commit
to mridula-s109/elasticsearch
that referenced
this pull request
Jul 2, 2025
…lastic#130363) Follow-up to elastic#130049 to gate using the binary format for the stored field in match_only_text fields behind an index version.
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]>
mridula-s109
pushed a commit
to mridula-s109/elasticsearch
that referenced
this pull request
Jul 3, 2025
…lastic#130363) Follow-up to elastic#130049 to gate using the binary format for the stored field in match_only_text fields behind an index version.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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 brings in the fixes from #130020, with minor updates to address review nits from that PR.