KTOR-6001 Cache returns null when vary header has more fields in the cached response #3655
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
marychatte
reviewed
Jun 23, 2023
| @@ -42,7 +42,9 @@ internal class UnlimitedStorage : CacheStorage { | |||
|
|
|||
| override suspend fun find(url: Url, varyKeys: Map<String, String>): CachedResponseData? { | |||
| val data = store.computeIfAbsent(url) { ConcurrentSet() } | |||
| return data.find { it.varyKeys == varyKeys } | |||
| return data.find { | |||
There was a problem hiding this comment.
There is one more find function on line 23, should we also change it like here?
There was a problem hiding this comment.
This is the legacy storage, but I changed it as well. Thanks!
| @@ -42,7 +42,9 @@ internal class UnlimitedStorage : CacheStorage { | |||
|
|
|||
| override suspend fun find(url: Url, varyKeys: Map<String, String>): CachedResponseData? { | |||
| val data = store.computeIfAbsent(url) { ConcurrentSet() } | |||
| return data.find { it.varyKeys == varyKeys } | |||
| return data.find { | |||
| varyKeys.all { (key, value) -> it.varyKeys[key] == value } | |||
There was a problem hiding this comment.
Shouldn't we also check the equal size of maps?
There was a problem hiding this comment.
No, it's ok if cached version has more vary properties, than the 304 response
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.
https://youtrack.jetbrains.com/issue/KTOR-6001