Store keyword fields that trip ignore_above in binary doc values#137483
Merged
parkertimmins merged 8 commits intoelastic:mainfrom Nov 25, 2025
Merged
Conversation
Kubik42
added
>enhancement
>non-issue
Team:StorageEngine
:StorageEngine/Mapping
Kubik42
force-pushed
the
store-keyword-fields-in-binary-doc-values-ignore-above
branch
3 times, most recently
from
2a64367 to
8bf42f4
Compare
Kubik42
commented
Nov 5, 2025
...per-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java
Show resolved
Hide resolved
Kubik42
commented
Nov 5, 2025
...per-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java
Outdated
Show resolved
Hide resolved
Kubik42
force-pushed
the
store-keyword-fields-in-binary-doc-values-ignore-above
branch
2 times, most recently
from
980e6c9 to
ffc2498
Compare
Collaborator
|
Pinging @elastic/es-storage-engine (Team:StorageEngine) |
Contributor
Author
|
The test is failing bc its expecting duplicate values, but with this change we're now deduplicating multi-valued fields in the same document. This is done for better storage efficiency. We can either change the test or keep the duplicates. |
Kubik42
commented
Nov 5, 2025
server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
Show resolved
Hide resolved
martijnvg
reviewed
Nov 6, 2025
Member
martijnvg
left a comment
martijnvg
left a comment
There was a problem hiding this comment.
Looks good left a few comments.
server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
Outdated
Show resolved
Hide resolved
...r/src/main/java/org/elasticsearch/index/mapper/BinaryDocValuesSyntheticFieldLoaderLayer.java
Show resolved
Hide resolved
...per-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java
Show resolved
Hide resolved
...per-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java
Outdated
Show resolved
Hide resolved
Kubik42
force-pushed
the
store-keyword-fields-in-binary-doc-values-ignore-above
branch
from
b074b90 to
3d83988
Compare
Kubik42
force-pushed
the
store-keyword-fields-in-binary-doc-values-ignore-above
branch
from
3d83988 to
a1d1d2a
Compare
martijnvg
approved these changes
Nov 11, 2025
Member
martijnvg
left a comment
martijnvg
left a comment
There was a problem hiding this comment.
Let's wait for compression of binary doc values to have been merged and its feature flag removed, otherwise LGTM
...les/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/match_only_text/10_basic.yml
Show resolved
Hide resolved
ncordon
pushed a commit
to ncordon/elasticsearch
that referenced
this pull request
Nov 26, 2025
…stic#137483) * Store keyword fields that trip ignore_above in binary doc values * Addressed feedback * Moved ignore values doc value field fetcher inside of existing fetcher function
| b.utf8Value(ref.bytes, ref.offset, ref.length); | ||
| } | ||
| }); | ||
| layers.add(new BinaryDocValuesSyntheticFieldLoaderLayer(fieldName)); |
Contributor
There was a problem hiding this comment.
Will this break BWC? Because old indices will have their ignored values stored in a stored field, and now the mapper can no longer load those values?
Comment on lines
-1156
to
+1166
| context.doc().add(new StoredField(fieldName, bytesRef)); | ||
|
|
||
| // store the value in a binary doc values field, create one if it doesn't exist | ||
| MultiValuedBinaryDocValuesField field = (MultiValuedBinaryDocValuesField) context.doc().getByKey(fieldName); | ||
| if (field == null) { | ||
| field = new MultiValuedBinaryDocValuesField(fieldName); | ||
| context.doc().addWithKey(fieldName, field); | ||
| } | ||
| field.add(bytesRef); |
Contributor
There was a problem hiding this comment.
Another BWC issue - old indices will have conflicting fieldinfos for <name>._original since we're switching from using a stored field to binary doc values.
martijnvg
added a commit
to martijnvg/elasticsearch
that referenced
this pull request
Dec 2, 2025
…ues (elastic#137483)" This reverts commit 6783135.
martijnvg
added a commit
that referenced
this pull request
Dec 2, 2025
This was referenced Dec 4, 2025
Kubik42
added a commit
to Kubik42/elasticsearch
that referenced
this pull request
Dec 4, 2025
…lues (elastic#137483)" (elastic#138858) This reverts commit c6cdc01.
Kubik42
added a commit
to Kubik42/elasticsearch
that referenced
this pull request
Dec 6, 2025
…lues (elastic#137483)" (elastic#138858) This reverts commit c6cdc01.
Kubik42
added a commit
that referenced
this pull request
Dec 10, 2025
…9093) * Reapply "Store keyword fields that trip ignore_above in binary doc values (#137483)" (#138858) This reverts commit c6cdc01. * Added index version checks * Added BWC test # Conflicts: # x-pack/plugin/logsdb/qa/legacy-rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/KeywordRollingUpgradeIT.java * [CI] Auto commit changes from spotless * Fixed compilation errors after merging from main * Refactored KeywordRollingUpgradeIT to support serverless * [CI] Auto commit changes from spotless --------- Co-authored-by: elasticsearchmachine <infra-root+elasticsearchmachine@elastic.co>
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
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.
https://github.com/elastic/logs-program/issues/13