Fix downsampling with disabled subobjects #138715
Open
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
>bug
auto-backport
Collaborator
|
Pinging @elastic/es-storage-engine (Team:StorageEngine) |
Collaborator
|
Hi @gmarouli, I've created a changelog YAML for you. |
kkrik-es
reviewed
Nov 27, 2025
server/src/test/java/org/elasticsearch/action/admin/cluster/stats/MappingVisitorTests.java
Outdated
Show resolved
Hide resolved
kkrik-es
reviewed
Nov 27, 2025
| private static void copyMapping(Map<String, ?> sourceMapping, Map<String, Object> updatedMapping) { | ||
| for (String f : sourceMapping.keySet()) { | ||
| if (f.equals(PROPERTIES) == false && f.equals(MULTI_FIELDS) == false) { | ||
| updatedMapping.put(f, sourceMapping.get(f)); |
Contributor
There was a problem hiding this comment.
This copies meta objects, correct? Let's cover in a test (if not already).
Contributor
Author
There was a problem hiding this comment.
Meta and other parameters such as scaling_factor etc.
kkrik-es
reviewed
Nov 27, 2025
| Map<String, Object> downsampledMapping = new HashMap<>(); | ||
| for (Map.Entry<String, Object> entry : sourceIndexMappings.entrySet()) { | ||
| if (entry.getKey().equals(PROPERTIES) == false) { | ||
| downsampledMapping.put(entry.getKey(), entry.getValue()); |
Contributor
There was a problem hiding this comment.
Why do we need this? Maybe add a comment?
kkrik-es
reviewed
Nov 27, 2025
| ); | ||
|
|
||
| HashMap<String, Object> result = new HashMap<>(); | ||
| MappingVisitor.visitAndCopyMapping(expectedProperties, result, (ignored, source, dest) -> { |
Contributor
There was a problem hiding this comment.
Shall we also add a test that creates random mappings and checks that the copied one is a clone of the source?
…ats/MappingVisitorTests.java Co-authored-by: Kostas Krikellas <[email protected]>
Contributor
Author
|
Update: I am currently working on the ci failures. The problem is that we need to be able to distringuish and handle differently a multi field from a subobjects false field :) Working on it. |
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.
The downsampling operation is editing the source mapping to replace gauge metrics with an aggregate type which contains the pre-aggregated data.
However, the process does not respect the disabled subobjects configured by parent fields, for example, a passthrough field and gets conflicts as it tried to reconstruct the updated mapping.
For example, the following valid mapping section:
gets converted to:
Which is not valid because the disabled subobjects is not set anymore.
This PR (re)proposes to use the visitor pattern to update the source mapping in place. Last time we proposed that there was a better solution; however, now we see that the original structure of the mapping is important for inherited properties.
Fixes: #138572