Ensure dynamicMapping updates are handled in insertion order #103047
Merged
Conversation
This file contains 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
benwtrent
added
>bug
:Search Foundations/Mapping
|
Pinging @elastic/es-search (Team:Search) |
|
Hi @benwtrent, I've created a changelog YAML for you. |
|
I confirmed this fix by running: #103015 The runtime is now at or below what it was in 8.10. I additionally double checked that the flame graphs were similar, and indeed they are. |
benwtrent
added
the
auto-backport-and-merge
💚 Backport successful
|
benwtrent
added a commit
to benwtrent/elasticsearch
that referenced
this pull request
Dec 6, 2023
…#103047) The switch to holding dynamic fields in a hashmap effectively randomizes their iteration order. This can be troublesome when building the mapping update required by these updates. When iterating in an unknown order, recursing to the leaf mapper can occur many times `O(n^2)`. However, starting with insertion order, it will occur only `O(n)` times. closes: elastic#103011
elasticsearchmachine
pushed a commit
that referenced
this pull request
Dec 6, 2023
#103083) The switch to holding dynamic fields in a hashmap effectively randomizes their iteration order. This can be troublesome when building the mapping update required by these updates. When iterating in an unknown order, recursing to the leaf mapper can occur many times `O(n^2)`. However, starting with insertion order, it will occur only `O(n)` times. closes: #103011
andreidan
reviewed
Dec 7, 2023
| @@ -166,9 +166,9 @@ protected DocumentParserContext( | |||
| mappingParserContext, | |||
| source, | |||
| new HashSet<>(), | |||
| new HashMap<>(), | |||
| new LinkedHashMap<>(), | |||
There was a problem hiding this comment.
Should we restrict the type of the fields to LinkedHashMap ?
i.e.
- private final Map<String, List<Mapper.Builder>> dynamicMappers;
+ private final LinkedHashMap<String, List<Mapper.Builder>> dynamicMappers;
private final Set<String> newFieldsSeen;
- private final Map<String, ObjectMapper.Builder> dynamicObjectMappers;
+ private final LinkedHashMap<String, ObjectMapper.Builder> dynamicObjectMappers;
private final List<RuntimeField> dynamicRuntimeFields;
private final DocumentDimensions dimensions;
private final ObjectMapper parent;
@@ -102,9 +102,9 @@ public abstract class DocumentParserContext {
MappingParserContext mappingParserContext,
SourceToParse sourceToParse,
Set<String> ignoreFields,
- Map<String, List<Mapper.Builder>> dynamicMappers,
+ LinkedHashMap<String, List<Mapper.Builder>> dynamicMappers,
Set<String> newFieldsSeen,
- Map<String, ObjectMapper.Builder> dynamicObjectMappers,
+ LinkedHashMap<String, ObjectMapper.Builder> dynamicObjectMappers,
benwtrent
added a commit
to benwtrent/elasticsearch
that referenced
this pull request
Jan 4, 2024
…lastic#103047)" This reverts commit d6e8217.
|
To clarify to folks digging between all the various issues, this PR didn't fully address the problem. See #103011 (comment). The real fix was in 8.11.4, and was a full revert of the originating bugged code. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 switch to holding dynamic fields in a hashmap effectively randomizes their iteration order. This can be troublesome when building the mapping update required by these updates. When iterating in an unknown order, recursing to the leaf mapper can occur many times
O(n^2). However, starting with insertion order, it will occur onlyO(n)times.closes: #103011