difftreelog
ci fix clippy warnings
in: master
3 files changed
Makefilediffbeforeafterboth1.PHONY: test build build-wasi2jsonnet-cpp:3 git clone https://github.com/google/jsonnet jsonnet-cpp4.ONESHELL:5jsonnet-sjsonnet:6 mkdir jsonnet-sjsonnet && cd jsonnet-sjsonnet7 wget https://github.com/databricks/sjsonnet/releases/download/0.2.4/sjsonnet.jar8 echo "#!/bin/sh" > sjsonnet9 echo "java -Xss400m -jar $(PWD)/jsonnet-sjsonnet/sjsonnet.jar $@" >> sjsonnet10 chmod +x sjsonnet1112.ONESHELL:13test-examples: jsonnet-cpp14 export JSONNET_BIN="$(PWD)/target/release/jrsonnet"15 export EXAMPLES_DIR="$(PWD)/jsonnet-cpp/examples/"16 cd ./jsonnet-cpp/examples/17 ./check.sh1819.ONESHELL:20test-tests: jsonnet-cpp21 export JSONNET_BIN="$(PWD)/target/release/jrsonnet --trace-format=go --thread-stack-size=96"22 cd ./jsonnet-cpp/test_suite/23 ./run_tests.sh2425test:26 cargo test27build:28 RUSTFLAGS="-Zmutable-noalias=yes -C link-arg=-s" cargo build --release -p jrsonnet29build-wasi:30 cd ./bindings/ && cargo build --release -p jsonnet --target wasm32-wasi3132bench = hyperfine --export-markdown "result.$(1).md" "jrsonnet $(1)" "gojsonnet $(1)" "jsonnet $(1)" "sjsonnet $(1)"33bench-larger-stack = hyperfine --export-markdown "result.$(1).md" "jrsonnet $(1)" "gojsonnet -s 200000 $(1)" "jsonnet -s 200000 $(1)" "sjsonnet $(1)"34bench-no-scala = hyperfine --export-markdown "result.$(1).md" "jrsonnet $(1)" "gojsonnet $(1)" "jsonnet $(1)"35bench-no-go = hyperfine --export-markdown "result.$(1).md" "jrsonnet $(1)" "jsonnet $(1)" "sjsonnet $(1)"3637.PHONY: benchmarks38.ONESHELL:39benchmarks: jsonnet-cpp jsonnet-sjsonnet40 export PATH=$(PWD)/target/release/:$(PWD)/jsonnet-sjsonnet/:$(PATH)4142 mkdir -p $(PWD)/benchmarks4344 cd jsonnet-cpp/benchmarks/4546 jrsonnet -S gen_big_object.jsonnet > bench.05.gen.jsonnet4748 $(call bench,bench.01.jsonnet)49 $(call bench,bench.02.jsonnet)50 $(call bench,bench.03.jsonnet)51 $(call bench,bench.04.jsonnet)52 $(call bench,bench.05.gen.jsonnet)53 # std.reverse not implemented in sjsonnet54 $(call bench-no-scala,bench.06.jsonnet)55 $(call bench-larger-stack,bench.07.jsonnet)56 $(call bench,bench.08.jsonnet)5758 rm -f result.md59 find . | /usr/bin/grep -oE "[a-z_0-9.]+.jsonnet$$" | grep -v gen_big_object | xargs -n1 -i sh -c 'printf "## {}\n\n" >> result.md && cat result.{}.md >> result.md && printf "\n" >> result.md'60 cp result.md $(PWD)/benchmarks/benchmarks.md6162 cd ../perf_tests/6364 $(call bench,large_string_join.jsonnet)65 # golang overflows os stack on this benchmark66 $(call bench-no-go,large_string_template.jsonnet)67 $(call bench,realistic1.jsonnet)68 $(call bench,realistic2.jsonnet)6970 rm -f result.md71 find . | /usr/bin/grep -oE "[a-z_0-9.]+.jsonnet$$" | xargs -n1 -i sh -c 'printf "## {}\n\n" >> result.md && cat result.{}.md >> result.md && printf "\n" >> result.md'72 cp result.md $(PWD)/benchmarks/perf_tests.md7374 cd $(PWD)/benchmarks/7576 rm -f result.md77 printf "# Benchmark results\n\n" > result.md78 cat benchmarks.md perf_tests.md >> result.mdREADME.mddiffbeforeafterboth--- a/README.md
+++ b/README.md
@@ -32,8 +32,6 @@
Official benchmark report are available [in this gist](https://gist.github.com/CertainLach/5770d7ad4836066f8e0bd91e823e451b), and updated sometimes. Here it tested against golang, C++, and scala impl. As you can see, it is a lot faster
-You can generate this report by calling `make benchmarks`, but it probally won't work in standard setup, you need to link golang jsonnet impl to gojsonnet, and c++ impl to jsonnet.
-
TODO: Create docker container for easier benchmarking and/or benchmark in CI
Also, there is some ideas to improve performance even further, by i.e:
crates/jrsonnet-evaluator/src/builtin/format.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/format.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/format.rs
@@ -690,12 +690,11 @@
if f.is_empty() {
throw!(MappingKeysRequired);
}
- let value = if let Some(v) = values.get(f.clone())? {
+ if let Some(v) = values.get(f.clone())? {
v
} else {
throw!(NoSuchFormatField(f));
- };
- value
+ }
};
format_code(&mut out, &value, &c, width, precision)?;