Pull in upstream changes

.gitignore

@@ -3,4 +3,7 @@
 !.idea/runConfigurations/
 /target/
 Cargo.lock
-callgrind.out.*
+callgrind.out.*
+perf.data
+perf.data.*
+massif.out.*

Cargo.toml

@@ -10,18 +10,19 @@ keywords = ["jsonpath", "json", "webassembly", "lua", "query"]
 categories = ['wasm', "parser-implementations", "api-bindings"]
 
 repository = "https://github.com/freestrings/jsonpath"
-documentation = "https://docs.rs/jsonpath_lib/0.2.6/jsonpath_lib"
+documentation = "https://docs.rs/jsonpath_lib/0.3.0/jsonpath_lib"
 license = "MIT"
 
 [badges]
 travis-ci = { repository = "freestrings/jsonpath", branch = "master" }
 
 [dependencies]
 log = "0.4"
-env_logger = "0.7"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["preserve_order"] }
-array_tool = "1.0.3"
+
+[dev-dependencies]
+env_logger = "0.8"
 
 [lib]
 name = "jsonpath_lib"

README.md

@@ -193,10 +193,10 @@ assert_eq!(ret[0], person);
 
 </details>
 
-<details><summary><b>Rust - jsonpath::Compiled::compile(jsonpath: &str)</b></summary>
+<details><summary><b>Rust - jsonpath::PathCompiled::compile(jsonpath: &str)</b></summary>
 
 ```rust
-let template = jsonpath::Compiled::compile("$..friends[0]").unwrap();
+let template = jsonpath::PathCompiled::compile("$..friends[0]").unwrap();
 
 let json_obj = json!({
     "school": {

benchmark/Cargo.toml

@@ -14,4 +14,7 @@ bencher = "0.1.5"
 
 [[bin]]
 name = "jsonpath_lib_benches"
-path = "src/main.rs"
+path = "src/main.rs"
+
+[profile.release]
+debug = true

benchmark/README.md

@@ -0,0 +1,52 @@
+# 프레임그래프 생성 방법
+
+## 사전 준비
+1. perf 설치
+2. flamegraph 다운로드
+    - https://github.com/brendangregg/FlameGraph
+3. rust-unmangle 다운로드
+    - https://github.com/Yamakaky/rust-unmangle
+    - 실행 파일로 만들고
+4. PATH에 추가
+
+```bash
+export PATH=/home/han/Documents/FlameGraph:$PATH
+export PATH=/home/han/Documents/rust-unmangle:$PATH
+```
+
+5. 설정 추가
+
+```bash
+sudo sh -c 'echo 1 >/proc/sys/kernel/perf_event_paranoid'
+sudo sh -c 'echo 0 >/proc/sys/kernel/kptr_restrict'
+```
+
+## 실행
+
+> ./gen_flamegraph.sh
+
+# 발그라인드 생성 방법
+
+## 사전 준비
+1. valgrind 설치
+> sudo apt-get install valgrind
+
+2. massif-visualizer
+> sudo apt-get install massif-visualizer
+
+## 실행
+
+> ./gen_valgrind.sh
+> massif-visualizer 실행 #massif.out.xxx 읽기
+
+
+## call 그래프 보려면
+
+2. kcachegrind 설치
+> sudo apt-get install kcachegrind
+
+## 실행
+
+> ./gen_valgrind.sh # --tool=callgrind --dump-instr=yes --collect-jumps=yes --simulate-cache=yes
+> kcachegrind #callgrind.out.xxx 읽기
+> 

benchmark/benches/bench.rs

@@ -6,12 +6,12 @@ extern crate serde_json;
 extern crate test;
 
 use std::io::Read;
+use std::rc::Rc;
 
+use jsonpath::{JsonSelector, JsonSelectorMut, PathParser};
 use serde::Deserialize;
 use serde_json::Value;
 
-use jsonpath::{SelectorMut, Selector};
-
 use self::test::Bencher;
 
 fn read_json(path: &str) -> String {
@@ -79,7 +79,7 @@ fn bench_select_as_str(b: &mut Bencher) {
 #[bench]
 fn bench_compile(b: &mut Bencher) {
     let json = get_json();
-    let template = jsonpath::Compiled::compile(get_path()).unwrap();
+    let template = jsonpath::PathCompiled::compile(get_path()).unwrap();
     b.iter(move || {
         for _ in 1..100 {
             let _ = template.select(&json).unwrap();
@@ -109,8 +109,8 @@ fn bench_select_as(b: &mut Bencher) {
 #[bench]
 fn bench_delete(b: &mut Bencher) {
     let json = get_json();
-    let mut selector = SelectorMut::default();
-    let _ = selector.str_path(get_path());
+    let parser = PathParser::compile(get_path()).unwrap();
+    let mut selector = JsonSelectorMut::new(parser);
 
     b.iter(move || {
         for _ in 1..100 {
@@ -123,15 +123,16 @@ fn bench_delete(b: &mut Bencher) {
 fn bench_select_to_compare_with_delete(b: &mut Bencher) {
     let json = &get_json();
 
-    let mut selector = Selector::default();
-    let _ = selector.str_path(get_path());
+    let parser = Rc::new(PathParser::compile(get_path()).unwrap());
 
     b.iter(move || {
         for _ in 1..100 {
-            let json = json.clone();
-            let mut s = Selector::default();
-            let _ = s.compiled_path(selector.node_ref().unwrap()).value(&json);
-            let _ = s.select();
+            let mut s = JsonSelector::new_ref(Rc::clone(&parser));
+            let _ = s.value(&json);
+            let r = s.select();
+            if r.is_err() {
+                panic!()
+            }
         }
     });
 }

benchmark/benches/bench_example.rs

@@ -53,8 +53,8 @@ fn _selector(b: &mut Bencher, index: usize) {
     let json = get_json();
     b.iter(move || {
         for _ in 1..100 {
-            let mut selector = jsonpath::Selector::default();
-            let _ = selector.str_path(get_path(index));
+            let parser = jsonpath::PathParser::compile(get_path(index)).unwrap();
+            let mut selector = jsonpath::JsonSelector::new(parser);
             selector.value(&json);
             let r = selector.select();
             if r.is_err() {