Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Do Not Increment Cache Hits For Expired Entries #163

Merged
merged 2 commits into from
Oct 19, 2023
Merged

Do Not Increment Cache Hits For Expired Entries #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
490e9b3
do not increment cache hits for expired entries
adamgfraser Oct 19, 2023
61fc8e1
format
adamgfraser Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion zio-cache/shared/src/main/scala/zio/cache/Cache.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,11 @@ object Cache {
promise.await
case MapValue.Complete(key, exit, _, timeToLive) =>
trackAccess(key)
trackHit()
if (hasExpired(timeToLive)) {
map.remove(k, value)
get(in)
} else {
trackHit()
ZIO.done(exit)
}
case MapValue.Refreshing(
Expand Down
17 changes: 16 additions & 1 deletion zio-cache/shared/src/test/scala/zio/cache/CacheSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
package zio.cache

import zio._
import zio.test.Assertion._
import zio.test._
import zio.{Duration, Ref, Scope, UIO, ZIO, duration2DurationOps}

object CacheSpec extends ZIOSpecDefault {

def hash(x: Int): Int => UIO[Int] =
y => ZIO.succeed((x ^ y).hashCode)

val identity: Int => UIO[Int] =
ZIO.succeed(_)

def spec: Spec[TestEnvironment with Scope, Any] = suite("CacheSpec")(
test("cacheStats") {
check(Gen.int) { salt =>
Expand Down Expand Up @@ -142,6 +145,18 @@ object CacheSpec extends ZIOSpecDefault {
size <- cache.size
} yield assertTrue(size == 10)
}
},
test("cache hits should not be incremented for expired entries") {
for {
cache <- Cache.make(100, 1.second, Lookup(identity))
_ <- cache.get(42)
_ <- TestClock.adjust(2.seconds)
_ <- cache.get(42)
cacheStats <- cache.cacheStats
hits = cacheStats.hits
misses = cacheStats.misses
} yield assertTrue(hits == 0L) &&
assertTrue(misses == 2L)
}
)
}