Optimize CacheKey handling in SpringIterableConfigurationPropertySource #16717
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
spring-projects-issues
added
the
status: waiting-for-triage
|
As an addendum. This brings us pretty close to the performance of 1.5 for such big files.
|
|
Test failure seems unrelated |
philwebb
added
theme: performance
|
Thanks @dreis2211, sorry about the delay getting to these. I hope to review soon. |
|
Don't worry. There's release preparation, the new annotations API and it's conference season etc.. Whenever you're ready :) |
|
This is great!!! I've updated things a little in this commit so that sources actually need to declare themselves as immutable. We can then use a shared cache key that always matches. This should save us from even creating the |
philwebb
pushed a commit
that referenced
this pull request
Jun 4, 2019
Update `SpringIterableConfigurationPropertySource` so that cache keys do not need to be checked if property sources are immutable. See gh-16717
philwebb
added a commit
that referenced
this pull request
Jun 4, 2019
Make immutable properties more explicit and trust that they truly won't change. See gh-16717
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.
Hi,
as described in #16401 there is an optimization opportunity in
SpringIterableConfigurationPropertySourcewhen checking for CacheKey equality. Currently, for large Sets this takes a considerable amount of time as the two Sets are usually equal, but not the same instance. This is due to the fact that the internal key inside CacheKey is copied in order to fix #13344 and can thus not benefit from a==comparison.The idea of this PR is to introduce a flag that effectively disables the copying of the internal key under certain circumstances. Imho, this could be done for
OriginTrackedMapPropertySourceinstances which is used to load either.yamlor.propertiesfiles, which usually shouldn't be a subject of change (and even if require a refresh of some sort). I still implemented an additional check for the size of the internal key in a best effort to track key additions at least forOriginTrackedMapPropertySources, too.With the applied changes, I see major improvements compared to a M2 baseline.
Let me know what you think.
Cheers,
Christoph