Skip to content

perf: memoize import path resolution in CachedImporter #880

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

Open
He-Pin wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −1
Open

perf: memoize import path resolution in CachedImporter #880

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion sjsonnet/src/sjsonnet/Importer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,16 @@ class CachedImporter(parent: Importer) extends Importer {
val cache: mutable.HashMap[(Path, Boolean), ResolvedFile] =
mutable.HashMap.empty[(Path, Boolean), ResolvedFile]

def resolve(docBase: Path, importName: String): Option[Path] = parent.resolve(docBase, importName)
// Memoize path resolution by (docBase, importName). resolve() runs on every visitImport — before
// the evaluator's by-path Val cache is consulted — and each call stats candidate paths
// (docBase + every jpath) via os.isFile. Resolution is deterministic within a run, so caching it
// turns repeated imports (and re-evaluated import exprs) into a HashMap lookup, eliminating
// redundant filesystem stats. Mirrors the existing read cache.
private val resolveCache: mutable.HashMap[(Path, String), Option[Path]] =
mutable.HashMap.empty[(Path, String), Option[Path]]

def resolve(docBase: Path, importName: String): Option[Path] =
resolveCache.getOrElseUpdate((docBase, importName), parent.resolve(docBase, importName))

def read(path: Path, binaryData: Boolean): Option[ResolvedFile] = {
val key = (path, binaryData)
Expand Down
Loading