-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
KTOR-6001 Cache returns null when vary header has more fields in the cached response #3655
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,7 +22,9 @@ internal class UnlimitedCacheStorage : HttpCacheStorage() { | |
|
||
override fun find(url: Url, varyKeys: Map<String, String>): HttpCacheEntry? { | ||
val data = store.computeIfAbsent(url) { ConcurrentSet() } | ||
return data.find { it.varyKeys == varyKeys } | ||
return data.find { | ||
varyKeys.all { (key, value) -> it.varyKeys[key] == value } | ||
} | ||
} | ||
|
||
override fun findByUrl(url: Url): Set<HttpCacheEntry> = store[url] ?: emptySet() | ||
|
@@ -42,7 +44,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. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Shouldn't we also check the equal size of maps? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No, it's ok if cached version has more vary properties, than the 304 response |
||
} | ||
} | ||
|
||
override suspend fun findAll(url: Url): Set<CachedResponseData> = store[url] ?: emptySet() | ||
|
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -75,6 +75,29 @@ class FileCacheTest : ClientLoader() { | |
} | ||
} | ||
|
||
@Test | ||
fun testReuseCacheStorage() = clientTests(listOf("Js")) { | ||
config { | ||
install(HttpCache) { | ||
publicStorage([email protected]) | ||
privateStorage([email protected]) | ||
} | ||
} | ||
|
||
test { client -> | ||
val client1 = client.config { } | ||
val client2 = client.config { } | ||
val url = Url("$TEST_SERVER/cache/etag-304") | ||
|
||
val first = client1.get(url) | ||
val second = client2.get(url) | ||
|
||
assertEquals(HttpStatusCode.OK, first.status) | ||
assertEquals(HttpStatusCode.OK, second.status) | ||
assertEquals(first.body<String>(), second.body<String>()) | ||
} | ||
} | ||
|
||
@Test | ||
fun testLongPath() = clientTests { | ||
config { | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is one more
find
function on line 23, should we also change it like here?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the legacy storage, but I changed it as well. Thanks!