Skip to content

Commit 9bd52b5

Browse files
authored
chore: fix bench suite (#602)
tested with `./mill bench.runRegressions`
1 parent edd3f52 commit 9bd52b5

3 files changed

Lines changed: 12 additions & 9 deletions

File tree

bench/src/sjsonnet/bench/MainBenchmark.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ object MainBenchmark {
3333
Map("var1" -> "\"test\"", "var2" -> """{"x": 1, "y": 2}"""),
3434
Map.empty[String, String],
3535
OsPath(wd),
36-
importer = SjsonnetMainBase
37-
.resolveImport(config.getOrderedJpaths.map(os.Path(_, wd)).map(OsPath(_)), None),
36+
importer = new SjsonnetMainBase.SimpleImporter(
37+
config.getOrderedJpaths.map(os.Path(_, wd)).map(OsPath(_)),
38+
None
39+
),
3840
parseCache = parseCache
3941
)
4042
val renderer = new Renderer(new StringWriter, indent = 3)

bench/src/sjsonnet/bench/MaterializerBenchmark.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@ class MaterializerBenchmark {
3434
Map.empty[String, String],
3535
Map.empty[String, String],
3636
OsPath(wd),
37-
importer = SjsonnetMainBase
38-
.resolveImport(
39-
config.getOrderedJpaths.map(os.Path(_, wd)).map(OsPath(_)).toIndexedSeq,
40-
None
41-
),
37+
importer = new SjsonnetMainBase.SimpleImporter(
38+
config.getOrderedJpaths.map(os.Path(_, wd)).map(OsPath(_)).toIndexedSeq,
39+
None
40+
),
4241
parseCache = new DefaultParseCache
4342
)
4443
value = interp.evaluate(os.read(path), OsPath(path)).toOption.get

bench/src/sjsonnet/bench/RunProfiler.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ object RunProfiler extends App {
1818
Map.empty[String, String],
1919
Map.empty[String, String],
2020
OsPath(wd),
21-
importer = SjsonnetMainBase
22-
.resolveImport(config.getOrderedJpaths.map(os.Path(_, wd)).map(OsPath(_)).toIndexedSeq, None),
21+
importer = new SjsonnetMainBase.SimpleImporter(
22+
config.getOrderedJpaths.map(os.Path(_, wd)).map(OsPath(_)).toIndexedSeq,
23+
None
24+
),
2325
parseCache = parseCache
2426
) {
2527
override def createEvaluator(

0 commit comments

Comments
 (0)