Remove lock from OptimisticCache and unmerge it from MemoryCache #5662
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
…ticNormalizedCache and MemoryCache
martinbonnin
approved these changes
Feb 28, 2024
BoD
added a commit
that referenced
this pull request
Mar 6, 2024
BoD
added a commit
that referenced
this pull request
Mar 7, 2024
* Add a benchmark: CacheIncubatingTests.concurrentReadWriteFromCache * Use guava in JVM * Refact to prepare merging MemoryCache and OptimisticCache: NormalizedCache and OptimisticNormalizedCache are now interfaces. Also remove chaining. * Make NormalizedCache implement OptimisticNormalizedCache * Fix unit tests * Use Store's Guava port instead of Guava JVM * Add Cache.asMap() * Use Store based LRUCache on all platforms * Move Store classes to own package * Distinguish caches in dump() * Add header to Store files. * Fix some compilation errors in tests * Update libraries/apollo-normalized-cache-api-incubating/src/wasmJsMain/kotlin/com/apollographql/apollo3/cache/normalized/api/internal/ConcurrentMap.wasmJs.kt Co-authored-by: Martin Bonnin <martin@mbonnin.net> * Update libraries/apollo-normalized-cache-api-incubating/src/jsMain/kotlin/com/apollographql/apollo3/cache/normalized/api/internal/ConcurrentMap.js.kt Co-authored-by: Martin Bonnin <martin@mbonnin.net> * Suppress unused parameters * Tweak NormalizedCache.remove()'s KDoc * Remove lock from OptimisticCache and unmerge it from MemoryCache (#5662) * Fix atomicfu dependency --------- Co-authored-by: Martin Bonnin <martin@mbonnin.net>
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.
A followup to #5651.
I reverted the merge of OptimisticCache with MemoryCache after all, as doing the same with SqlCache would duplicate the code for no good reason. The important change was to remove the use of a lock, using
ConcurrentHashMapinstead (JVM only).While the benchmarks tended to show some improvement with the MemoryCache, the same change here with SqlCache seems to make no significant impact: