[Downsampling++] Allow merging of passthrough mappers with object mappers under certain conditions.#135431
Merged
elasticsearchmachine merged 11 commits intoelastic:mainfrom Sep 30, 2025
Conversation
gmarouli
force-pushed
the
fix-downsampling-passthrough-fields-v2
branch
from
4e4c829 to
c7656ea
Compare
Collaborator
|
Pinging @elastic/es-storage-engine (Team:StorageEngine) |
Collaborator
|
Hi @gmarouli, I've created a changelog YAML for you. |
kkrik-es
reviewed
Sep 29, 2025
| }); | ||
| safeAwait(listener); | ||
|
|
||
| assertDownsampleIndexFieldsAndDimensions(sourceIndex, targetIndex, downsampleConfig); |
Contributor
There was a problem hiding this comment.
Consider deduplicating the shared parts.
kkrik-es
approved these changes
Sep 29, 2025
Contributor
|
Maybe backport to |
gmarouli
added
auto-backport
gmarouli
added
the
auto-merge-without-approval
Collaborator
💚 Backport successful
|
gmarouli
added a commit
to gmarouli/elasticsearch
that referenced
this pull request
Sep 30, 2025
…pers under certain conditions. (elastic#135431) This PR is an alternative of elastic#134996: This fixes a bug that would be triggered when we would downsample an index that had a metric field under a passthrough field. For example: ``` "metrics": { "type": "passthrough", "priority": 10, "properties": { "cpu_usage": { "type": "double", "time_series_metric": "gauge" } } } ``` In this PR, we extend the merging possibilities of a passthrough field to allow merging with object mappers that have subobjects false and they are not a root object. They also fix merging an object mapper with a passthrough field and ensure that the result will either be a passthrough field or an error if the objects are incompatible.
Contributor
Author
We opened a backport PR but it looks like we need extra changes to allow an object to merge with a passthrough object. Considering this, we advice to not backport this to @felixbarny & @AlexanderWert any objections? |
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
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 PR is an alternative of #134996:
This fixes a bug that would be triggered when we would downsample an index that had a metric field under a passthrough field. For example:
In this PR, we extend the merging possibilities of a passthrough field to allow merging with object mappers that have subobjects false and they are not a root object. They also fix merging an object mapper with a passthrough field and ensure that the result will either be a passthrough field or an error if the objects are incompatible.