Skip to content

Commit a7b7e3f

Browse files
committed
logCacheHitOrMiss flag has now been placed at the call site instead of within the function. Attempt to improve performance cb372#100
1 parent 960e6f7 commit a7b7e3f

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

caffeine/src/main/scala/scalacache/caffeine/CaffeineCache.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ class CaffeineCache(underlying: CCache[String, Object])
4343
if (entry.isExpired) None else Some(entry.value)
4444
} else None
4545
}
46-
logCacheHitOrMiss(key, result)
46+
if (logger.isDebugEnabled)
47+
logCacheHitOrMiss(key, result)
4748
Future.successful(result)
4849
}
4950

core/src/main/scala/scalacache/LoggingSupport.scala

+2-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ trait LoggingSupport {
1919
* @tparam A the type of the cache value
2020
*/
2121
protected def logCacheHitOrMiss[A](key: String, result: Option[A]): Unit = {
22-
if (logger.isDebugEnabled) {
23-
val hitOrMiss = result.map(_ => "hit") getOrElse "miss"
24-
logger.debug(s"Cache $hitOrMiss for key $key")
25-
}
22+
val hitOrMiss = result.map(_ => "hit") getOrElse "miss"
23+
logger.debug(s"Cache $hitOrMiss for key $key")
2624
}
2725

2826
/**

ehcache/src/main/scala/scalacache/ehcache/EhcacheCache.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ class EhcacheCache(underlying: Ehcache)
3333
if (elem == null) None
3434
else Option(elem.getObjectValue.asInstanceOf[V])
3535
}
36-
37-
logCacheHitOrMiss(key, result)
36+
if (logger.isDebugEnabled)
37+
logCacheHitOrMiss(key, result)
3838
Future.successful(result)
3939
}
4040

guava/src/main/scala/scalacache/guava/GuavaCache.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ class GuavaCache(underlying: GCache[String, Object])
4444
if (entry.isExpired) None else Some(entry.value)
4545
} else None
4646
}
47-
logCacheHitOrMiss(key, result)
47+
if (logger.isDebugEnabled)
48+
logCacheHitOrMiss(key, result)
4849
Future.successful(result)
4950
}
5051

memcached/src/main/scala/scalacache/memcached/MemcachedCache.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ class MemcachedCache(client: MemcachedClient,
4646
Some(codec.deserialize(baseResult.asInstanceOf[Array[Byte]]))
4747
} else None
4848
}
49-
logCacheHitOrMiss(key, result)
49+
if (logger.isDebugEnabled)
50+
logCacheHitOrMiss(key, result)
5051
Success(result)
5152
}
5253
})

redis/src/main/scala/scalacache/redis/RedisCacheBase.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ trait RedisCacheBase
6363
Some(deserialize[V](bytes))
6464
} else None
6565
}
66-
logCacheHitOrMiss(key, result)
66+
if (logger.isDebugEnabled)
67+
logCacheHitOrMiss(key, result)
6768
result
6869
}
6970
}

0 commit comments

Comments
 (0)