Implement DiffableStringMap's get and containsKey in terms of the wrapped innerMap #77965
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
In practice, the wrapped innerMap is either empty or a HashMap, so we can get much better performance here by delegating to it for these methods -- as opposed to using the default implementations from AbstractMap which do a linear scan through via an iterator() of the entrySet().
joegallo
added
>bug
:Data Management/ILM+SLM
elasticmachine
added
the
Team:Data Management
|
Pinging @elastic/es-data-management (Team:Data Management) |
probakowski
approved these changes
Sep 16, 2021
nik9000
approved these changes
Sep 16, 2021
DaveCTurner
approved these changes
Sep 17, 2021
joegallo
added a commit
that referenced
this pull request
Sep 17, 2021
wjp719
added a commit
to wjp719/elasticsearch
that referenced
this pull request
Sep 18, 2021
* master: (185 commits) Implement get and containsKey in terms of the wrapped innerMap (elastic#77965) Adjust Lucene version and enable BWC tests (elastic#77933) Disable BWC to upgrade to Lucene-8.10-snapshot Reenable MlDistributedFailureIT [DOCS] Fix typo for `script.painless.regex.enabled` setting value (elastic#77853) Upgrade to Lucene-8.10.0-snapshot-bf2fcb53079 (elastic#77801) [DOCS] Fix ESS install lead-in (elastic#77887) Resolve thirdparty gradle plugin artifacts from mavencentral (elastic#77865) Reduce the number of times that `LifecycleExecutionState` is parsed when running a policy. (elastic#77863) Utility methods to add and remove backing indices from data streams (elastic#77778) Use Objects.equals() instead of == to compare strings (elastic#77840) [ML] prefer least allocated model when a new node is added to the cluster (elastic#77756) Deprecate ignore_throttled parameter (elastic#77479) Improve LifecycleExecutionState parsing. (elastic#77855) [DOCS] Removes deprecated word from HLRC title. (elastic#77851) Remove legacy geo code from AggregationResultUtils (elastic#77702) Adjust SearchableSnapshotsBlobStoreCacheIntegTests.testBlobStoreCache (elastic#77758) Laxify SecureSM to allow creation of the JDK's innocuous threads (elastic#77789) [Test] Reduce concurrency when testing creation of security index (elastic#75293) Refactor metric PipelineAggregation integration test (elastic#77548) ... # Conflicts: # server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java
|
Thanks @joegallo, this is a great fix! Maybe also backport this change to the 7.15 branch? |
joegallo
added a commit
that referenced
this pull request
Sep 20, 2021
97 tasks
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.
In practice, the wrapped
innerMapis either empty or aHashMap, so we can get much better performance here by delegating to it for these methods -- as opposed to using the default implementations fromAbstractMap(javadoc link) which do a linear scan through via aniterator()of theentrySet().Totally unscientific (because I'm using it for the first time) JMH results from before:
and after:
This ends up mattering because
LifecycleExecutionState#fromIndexMetadataends up loading all the keys it's interested in by way ofLifecycleExecutionState#fromCustomMetadataand there's a lot of them. ThecustomDatamap there is aDiffableStringMap, so we're doing a scan through all the keys infromCustomMetadatainvokinggeteach time, andgetitself was doing a further scan through all the keys (well, half the keys, on average) internally, sofromIndexMetadatawas accidentally quadratic.