Move to concurrenthashmap for the pattern cache

stephenamar-db · stephenamar-db · commit e101c10c2d27 · 2024-12-28T20:00:41.000-08:00
diff --git a/sjsonnet/src-js/sjsonnet/Platform.scala b/sjsonnet/src-js/sjsonnet/Platform.scala
@@ -40,9 +40,7 @@ object Platform {
     throw new Exception("hashFile not implemented in Scala.js")
   }
 
-  private val regexCache = new util.LinkedHashMap[String, Pattern](100, 0.75f, true) {
-    override def removeEldestEntry(eldest: util.Map.Entry[String, Pattern]): Boolean = size() > 100
-  }
+  private val regexCache = new util.concurrent.ConcurrentHashMap[String, Pattern]
   def getPatternFromCache(pat: String) : Pattern = regexCache.computeIfAbsent(pat, _ => Pattern.compile(pat))
 
   def regexQuote(s: String): String = Pattern.quote(s)
diff --git a/sjsonnet/src-jvm/sjsonnet/Platform.scala b/sjsonnet/src-jvm/sjsonnet/Platform.scala
@@ -111,9 +111,7 @@ object Platform {
     hash.getValue.toString
   }
 
-  private val regexCache = new util.LinkedHashMap[String, Pattern](100, 0.75f, true) {
-    override def removeEldestEntry(eldest: util.Map.Entry[String, Pattern]): Boolean = size() > 100
-  }
+  private val regexCache = new util.concurrent.ConcurrentHashMap[String, Pattern]
   def getPatternFromCache(pat: String) : Pattern = regexCache.computeIfAbsent(pat, _ => Pattern.compile(pat))
 
   def regexQuote(s: String): String = Pattern.quote(s)
diff --git a/sjsonnet/src-native/sjsonnet/Platform.scala b/sjsonnet/src-native/sjsonnet/Platform.scala
@@ -53,9 +53,7 @@ object Platform {
     scala.io.Source.fromFile(file).mkString
   }
 
-  private val regexCache = new util.LinkedHashMap[String, Pattern](100, 0.75f, true) {
-    override def removeEldestEntry(eldest: util.Map.Entry[String, Pattern]): Boolean = size() > 100
-  }
+  private val regexCache = new util.concurrent.ConcurrentHashMap[String, Pattern]
   def getPatternFromCache(pat: String) : Pattern = regexCache.computeIfAbsent(pat, _ => Pattern.compile(pat))
 
   def regexQuote(s: String): String = Pattern.quote(s)

Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,7 @@ object Platform {`
`40`	`40`	`throw new Exception("hashFile not implemented in Scala.js")`
`41`	`41`	`}`
`42`	`42`
`43`		`- private val regexCache = new util.LinkedHashMap[String, Pattern](100, 0.75f, true) {`
`44`		`- override def removeEldestEntry(eldest: util.Map.Entry[String, Pattern]): Boolean = size() > 100`
`45`		`- }`
	`43`	`+ private val regexCache = new util.concurrent.ConcurrentHashMap[String, Pattern]`
`46`	`44`	`def getPatternFromCache(pat: String) : Pattern = regexCache.computeIfAbsent(pat, _ => Pattern.compile(pat))`
`47`	`45`
`48`	`46`	`def regexQuote(s: String): String = Pattern.quote(s)`
Original file line number	Diff line number	Diff line change
`@@ -111,9 +111,7 @@ object Platform {`
`111`	`111`	`hash.getValue.toString`
`112`	`112`	`}`
`113`	`113`
`114`		`- private val regexCache = new util.LinkedHashMap[String, Pattern](100, 0.75f, true) {`
`115`		`- override def removeEldestEntry(eldest: util.Map.Entry[String, Pattern]): Boolean = size() > 100`
`116`		`- }`
	`114`	`+ private val regexCache = new util.concurrent.ConcurrentHashMap[String, Pattern]`
`117`	`115`	`def getPatternFromCache(pat: String) : Pattern = regexCache.computeIfAbsent(pat, _ => Pattern.compile(pat))`
`118`	`116`
`119`	`117`	`def regexQuote(s: String): String = Pattern.quote(s)`
Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,7 @@ object Platform {`
`53`	`53`	`scala.io.Source.fromFile(file).mkString`
`54`	`54`	`}`
`55`	`55`
`56`		`- private val regexCache = new util.LinkedHashMap[String, Pattern](100, 0.75f, true) {`
`57`		`- override def removeEldestEntry(eldest: util.Map.Entry[String, Pattern]): Boolean = size() > 100`
`58`		`- }`
	`56`	`+ private val regexCache = new util.concurrent.ConcurrentHashMap[String, Pattern]`
`59`	`57`	`def getPatternFromCache(pat: String) : Pattern = regexCache.computeIfAbsent(pat, _ => Pattern.compile(pat))`
`60`	`58`
`61`	`59`	`def regexQuote(s: String): String = Pattern.quote(s)`