Use a ConcurrentHashMap for CacheState#map

zio · Feb 20, 2025 · 2713aea · 2713aea
1 parent 3a16fab
commit 2713aea
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 100 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,6 @@
 import Versions.*
 import BuildHelper.*
+import com.typesafe.tools.mima.core.*
 import zio.sbt.githubactions.Step
 
 enablePlugins(ZioSbtEcosystemPlugin, ZioSbtCiPlugin)
@@ -123,25 +124,33 @@ lazy val docs = project
 
 lazy val enforceMimaCompatibility = true // Enable / disable failing CI on binary incompatibilities
 
+lazy val mimaFilters = Seq(
+  ProblemFilters.exclude[Problem]("zio.cache.ScopedCacheImplementation#CacheState.map"),
+  ProblemFilters.exclude[MissingClassProblem]("zio.cache.Platform*"),
+  ProblemFilters.exclude[Problem]("zio.cache.Cache#CacheState*"),
+  ProblemFilters.exclude[Problem]("zio.cache.ScopedCache#CacheState*"),
+  ProblemFilters.exclude[Problem]("zio.cache.ScopedCacheImplementation#CacheState*")
+)
+
 lazy val enableMimaSettingsJVM =
   Def.settings(
     mimaFailOnProblem     := enforceMimaCompatibility,
     mimaPreviousArtifacts := previousStableVersion.value.map(organization.value %% moduleName.value % _).toSet,
-    mimaBinaryIssueFilters ++= Seq()
+    mimaBinaryIssueFilters ++= mimaFilters
   )
 
 lazy val enableMimaSettingsJS =
   Def.settings(
     mimaFailOnProblem     := enforceMimaCompatibility,
     mimaPreviousArtifacts := previousStableVersion.value.map(organization.value %%% moduleName.value % _).toSet,
-    mimaBinaryIssueFilters ++= Seq()
+    mimaBinaryIssueFilters ++= mimaFilters
   )
 
 lazy val enableMimaSettingsNative =
   Def.settings(
     mimaFailOnProblem     := enforceMimaCompatibility,
     mimaPreviousArtifacts := previousStableVersion.value.map(organization.value %%% moduleName.value % _).toSet,
-    mimaBinaryIssueFilters ++= Seq()
+    mimaBinaryIssueFilters ++= mimaFilters
   )
 
 ThisBuild / ciCheckArtifactsBuildSteps +=

diff --git a/zio-cache/js/src/main/scala/zio/cache/Platform.scala b/zio-cache/js/src/main/scala/zio/cache/Platform.scala
diff --git a/zio-cache/jvm/src/main/scala/zio/cache/Platform.scala b/zio-cache/jvm/src/main/scala/zio/cache/Platform.scala
diff --git a/zio-cache/native/src/main/scala/zio/cache/Platform.scala b/zio-cache/native/src/main/scala/zio/cache/Platform.scala
diff --git a/zio-cache/shared/src/main/scala/zio/cache/Cache.scala b/zio-cache/shared/src/main/scala/zio/cache/Cache.scala
@@ -21,7 +21,7 @@ import zio.internal.MutableConcurrentQueue
 import zio.stacktracer.TracingImplicits.disableAutoTrace
 
 import java.time.{Duration, Instant}
-import java.util.Map
+import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.{AtomicBoolean, LongAdder}
 import scala.annotation.tailrec
 
@@ -352,7 +352,7 @@ object Cache {
    * The `CacheState` represents the mutable state underlying the cache.
    */
   private final case class CacheState[Key, Error, Value](
-    map: Map[Key, MapValue[Key, Error, Value]],
+    map: ConcurrentHashMap[Key, MapValue[Key, Error, Value]],
     keys: KeySet[Key],
     accesses: MutableConcurrentQueue[MapKey[Key]],
     hits: LongAdder,
@@ -367,7 +367,7 @@ object Cache {
      */
     def initial[Key, Error, Value](): CacheState[Key, Error, Value] =
       CacheState(
-        Platform.newConcurrentMap,
+        new ConcurrentHashMap(),
         new KeySet,
         MutableConcurrentQueue.unbounded,
         new LongAdder,

diff --git a/zio-cache/shared/src/main/scala/zio/cache/ScopedCache.scala b/zio-cache/shared/src/main/scala/zio/cache/ScopedCache.scala
@@ -21,6 +21,7 @@ import zio.internal.MutableConcurrentQueue
 
 import java.time.{Duration, Instant}
 import java.util
+import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.{AtomicBoolean, AtomicInteger, LongAdder}
 import scala.jdk.CollectionConverters._
 
@@ -179,7 +180,7 @@ object ScopedCache {
    * The `CacheState` represents the mutable state underlying the cache.
    */
   private final case class CacheState[Key, Error, Value](
-    map: util.Map[Key, MapValue[Key, Error, Value]],
+    map: ConcurrentHashMap[Key, MapValue[Key, Error, Value]],
     keys: KeySet[Key],
     accesses: MutableConcurrentQueue[MapKey[Key]],
     hits: LongAdder,
@@ -194,7 +195,7 @@ object ScopedCache {
      */
     def initial[Key, Error, Value](): CacheState[Key, Error, Value] =
       CacheState(
-        Platform.newConcurrentMap,
+        new ConcurrentHashMap(),
         new KeySet,
         MutableConcurrentQueue.unbounded,
         new LongAdder,

diff --git a/zio-cache/shared/src/main/scala/zio/cache/ScopedCacheImplementation.scala b/zio-cache/shared/src/main/scala/zio/cache/ScopedCacheImplementation.scala
@@ -6,7 +6,7 @@ import zio.internal.MutableConcurrentQueue
 import zio.{Clock, Exit, IO, Scope, UIO, Unsafe, ZEnvironment, ZIO}
 
 import java.time.{Duration, Instant}
-import java.util
+import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.{AtomicBoolean, AtomicInteger, LongAdder}
 import scala.jdk.CollectionConverters._
 
@@ -248,7 +248,7 @@ object ScopedCacheImplementation {
      */
     def initial[Key, Error, Value](): CacheState[Key, Error, Value] =
       CacheState(
-        Platform.newConcurrentMap,
+        new ConcurrentHashMap(),
         new KeySet,
         MutableConcurrentQueue.unbounded,
         new LongAdder,
@@ -309,7 +309,7 @@ object ScopedCacheImplementation {
    * The `CacheState` represents the mutable state underlying the cache.
    */
   private final case class CacheState[Key, Error, Value](
-    map: util.Map[Key, MapValue[Key, Error, Value]],
+    map: ConcurrentHashMap[Key, MapValue[Key, Error, Value]],
     keys: KeySet[Key],
     accesses: MutableConcurrentQueue[MapKey[Key]],
     hits: LongAdder,