From 56a22674bfd80bb911596fde5bc2fb414009b53b Mon Sep 17 00:00:00 2001 From: freestrings Date: Mon, 3 Jun 2019 11:34:34 +0900 Subject: [PATCH] fix wasm benches --- benches/bench_example.rs | 5 ++++- benches/bench_native.sh | 2 -- benches/bench_wasm.sh | 5 ----- benches/javascript/bench.js | 19 +------------------ 4 files changed, 5 insertions(+), 26 deletions(-) diff --git a/benches/bench_example.rs b/benches/bench_example.rs index ad2ba62..3748ca7 100644 --- a/benches/bench_example.rs +++ b/benches/bench_example.rs @@ -57,7 +57,10 @@ fn _selector(b: &mut Bencher, index: usize) { let mut selector = jsonpath::Selector::new(); let _ = selector.path(get_path(index)); selector.value(&json); - let _ = selector.select(); + let r = selector.select(); + if r.is_err() { + panic!() + } } }); } diff --git a/benches/bench_native.sh b/benches/bench_native.sh index efb6a83..c9346c0 100755 --- a/benches/bench_native.sh +++ b/benches/bench_native.sh @@ -35,8 +35,6 @@ __extra () { sleep 1 cd "${DIR}"/javascript && echo "NodeJs - jsonpath-rs - compile: " && time ./bench.sh nativeCompile ${ITER} printf "\n" - sleep 1 - cd "${DIR}"/javascript && echo "NodeJs - jsonpath-rs - selectorClassMap: " && time ./bench.sh nativeSelectorClassMap ${ITER} } if [ "$1" = "extra" ]; then diff --git a/benches/bench_wasm.sh b/benches/bench_wasm.sh index 35be013..90ff812 100755 --- a/benches/bench_wasm.sh +++ b/benches/bench_wasm.sh @@ -36,13 +36,8 @@ __extra () { cd "${DIR}"/javascript && echo "NodeJs - jsonpath-wasm - compile: " && time ./bench.sh wasmCompile ${ITER} printf "\n" sleep 1 - cd "${DIR}"/javascript && echo "NodeJs - jsonpath-wasm - compile-alloc: " && time ./bench.sh wasmCompileAlloc ${ITER} - printf "\n" - sleep 1 cd "${DIR}"/javascript && echo "NodeJs - jsonpath-wasm - Selector: " && time ./bench.sh wasmSelectorClass ${ITER} printf "\n" - sleep 1 - cd "${DIR}"/javascript && echo "NodeJs - jsonpath-wasm - Selector map: " && time ./bench.sh wasmSelectorClassMap ${ITER} } if [ "$1" = "extra" ]; then diff --git a/benches/javascript/bench.js b/benches/javascript/bench.js index 6537aca..6856b3d 100644 --- a/benches/javascript/bench.js +++ b/benches/javascript/bench.js @@ -71,13 +71,6 @@ function nativeSelect() { } } -function nativeSelectorClassMap() { - let selector = new jpwRs.Selector(); - for (var i = 0; i < iter; i++) { - let _ = selector.path(path).value(jsonStr).map((v) => v).get(); - } -} - function wasmSelector() { let selector = jpw.selector(getJson()); for (var i = 0; i < iter; i++) { @@ -103,17 +96,7 @@ function wasmSelectorClass() { for (var i = 0; i < iter; i++) { selector.path(path); selector.value(jsonStr); - let _ = selector.selectToStr(); - } -} - -function wasmSelectorClassMap() { - let selector = new jpw.Selector(); - for (var i = 0; i < iter; i++) { - selector.path(path); - selector.value(jsonStr); - let _1 = selector.map((v) => v); - let _2 = selector.get(); + let _ = selector.select(); } }