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

Cache Scalafix instances globally #206

Merged
merged 4 commits into from
Oct 1, 2024
Merged

Cache Scalafix instances globally #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d57735
Cache Scalafix instances globally
lolgab Sep 30, 2024
f959deb
Use ConcurrentHashMap for better thread safety
lolgab Sep 30, 2024
c8798c6
Use `compute` to avoid concurrent initialization of the same key
lolgab Sep 30, 2024
617f307
Cache also `withToolClasspath` using two-layered cache
lolgab Sep 30, 2024
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
47 changes: 47 additions & 0 deletions mill-scalafix/src/com/goyeau/mill/scalafix/ScalafixCache.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package com.goyeau.mill.scalafix

import com.goyeau.mill.scalafix.CoursierUtils
import coursier.core.Repository
import mill.Agg
import mill.scalalib.Dep
import scalafix.interfaces.Scalafix
import scalafix.interfaces.ScalafixArguments

import java.util.concurrent.ConcurrentHashMap
import scala.jdk.CollectionConverters._
import scala.ref.SoftReference

private[scalafix] object ScalafixCache {

private val scalafixCache = new Cache[(String, java.util.List[coursierapi.Repository]), Scalafix](createFunction = {
case (scalaVersion, repositories) =>
Scalafix.fetchAndClassloadInstance(scalaVersion, repositories)
})

private val scalafixArgumentsCache =
new Cache[(String, Seq[Repository], Agg[Dep]), ScalafixArguments](createFunction = {
case (scalaVersion, repositories, scalafixIvyDeps) =>
val repos = repositories.map(CoursierUtils.toApiRepository).asJava
val deps = scalafixIvyDeps.map(CoursierUtils.toCoordinates).iterator.toSeq.asJava
scalafixCache
.getOrElseCreate((scalaVersion, repos))
.newArguments()
.withToolClasspath(Seq.empty.asJava, deps, repos)
})

def getOrElseCreate(scalaVersion: String, repositories: Seq[Repository], scalafixIvyDeps: Agg[Dep]) =
scalafixArgumentsCache.getOrElseCreate((scalaVersion, repositories, scalafixIvyDeps))

private class Cache[A, B <: AnyRef](createFunction: A => B) {
private val cache = new ConcurrentHashMap[A, SoftReference[B]]

def getOrElseCreate(a: A) =
cache.compute(
a,
{
case (_, v @ SoftReference(_)) => v
case _ => SoftReference(createFunction(a))
}
)()
}
}
11 changes: 2 additions & 9 deletions mill-scalafix/src/com/goyeau/mill/scalafix/ScalafixModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import mill.api.{Logger, PathRef, Result}
import mill.scalalib.{Dep, ScalaModule}
import mill.define.Command

import scalafix.interfaces.Scalafix
import scalafix.interfaces.ScalafixError.*

import scala.compat.java8.OptionConverters.*
Expand Down Expand Up @@ -77,21 +76,15 @@ object ScalafixModule {
wd: os.Path
): Result[Unit] =
if (sources.nonEmpty) {
val scalafix = Scalafix
.fetchAndClassloadInstance(scalaVersion, repositories.map(CoursierUtils.toApiRepository).asJava)
.newArguments()
val scalafix = ScalafixCache
.getOrElseCreate(scalaVersion, repositories, scalafixIvyDeps)
.withParsedArguments(args.asJava)
.withWorkingDirectory(wd.toNIO)
.withConfig(scalafixConfig.map(_.toNIO).asJava)
.withClasspath(classpath.map(_.toNIO).asJava)
.withScalaVersion(scalaVersion)
.withScalacOptions(scalacOptions.asJava)
.withPaths(sources.map(_.toNIO).asJava)
.withToolClasspath(
Seq.empty.asJava,
scalafixIvyDeps.map(CoursierUtils.toCoordinates).iterator.toSeq.asJava,
repositories.map(CoursierUtils.toApiRepository).asJava
)

log.info(s"Rewriting and linting ${sources.size} Scala sources against ${scalafix.rulesThatWillRun.size} rules")
val errors = scalafix.run()
Expand Down
Loading