get rid of JsonPathFinder and Boxes

CHANGELOG.md

@@ -1,48 +1,48 @@
-* **`0.1.0`**
-    * Initial implementation
-* **`0.1.1`**
-    * Technical improvements
-* **`0.1.2`**
-    * added a trait to obtain the result from value
-    * added a method to get the cloned as Value
-    * change the name of the general method*
-* **`0.1.4`**
-    * add an ability to use references instead of values
-    * fix some clippy issues
-* **`0.1.5`**
-    * correct grammar for `$.[..]`
-* **`0.1.6`**
-    * add logical OR and logical And to filters
-    * fix bugs with objects in filters
-    * add internal macros to generate path objects
-* **`0.2.0`**
-    * add json path value as a result for the library
-    * add functions (size)
-    * change a logical operator `size` into function `size()`
-* **`0.2.1`**
-    * changed the contract for length() function.
-* **`0.2.2`**
-    * add ..*
-* **`0.2.5`**
-    * build for tags
-* **`0.2.6`**
-    * make parser mod public
-* **`0.3.0`**
-    * introduce the different behaviour for empty results and non-existing result
-* **`0.3.2`**
-    * make jsonpath inst cloneable.
-* **`0.3.3`**
-    * fix a bug with the logical operators
-* **`0.3.4`**
-    * add a result as a path
-* **`0.3.5`**
-    * add `!` negation operation in filters
-    * allow using  () in filters
-* **`0.5`**
-    * add config for jsonpath
-    * add an option to add a regex cache for boosting performance
-* **`0.5.1`**
-    * add double quotes for the expressions (before it was only possible to use single quotes)
-    * add Debug on the JsonPathFinder
-
-
+- **`0.1.0`**
+  - Initial implementation
+- **`0.1.1`**
+  - Technical improvements
+- **`0.1.2`**
+  - added a trait to obtain the result from value
+  - added a method to get the cloned as Value
+  - change the name of the general method\*
+- **`0.1.4`**
+  - add an ability to use references instead of values
+  - fix some clippy issues
+- **`0.1.5`**
+  - correct grammar for `$.[..]`
+- **`0.1.6`**
+  - add logical OR and logical And to filters
+  - fix bugs with objects in filters
+  - add internal macros to generate path objects
+- **`0.2.0`**
+  - add json path value as a result for the library
+  - add functions (size)
+  - change a logical operator `size` into function `size()`
+- **`0.2.1`**
+  - changed the contract for length() function.
+- **`0.2.2`**
+  - add ..\*
+- **`0.2.5`**
+  - build for tags
+- **`0.2.6`**
+  - make parser mod public
+- **`0.3.0`**
+  - introduce the different behaviour for empty results and non-existing result
+- **`0.3.2`**
+  - make jsonpath inst cloneable.
+- **`0.3.3`**
+  - fix a bug with the logical operators
+- **`0.3.4`**
+  - add a result as a path
+- **`0.3.5`**
+  - add `!` negation operation in filters
+  - allow using () in filters
+- **`0.5`**
+  - add config for jsonpath
+  - add an option to add a regex cache for boosting performance
+- **`0.5.1`**
+  - add double quotes for the expressions (before it was only possible to use single quotes)
+  - add Debug on the JsonPathFinder
+- **`0.6`**
+  - allow to reuse regex, that improves performance without needing an internal cache

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "jsonpath-rust"
 description = "The library provides the basic functionality to find the set of the data according to the filtering query."
-version = "0.5.1"
+version = "0.6.0"
 authors = ["BorisZhguchev <[email protected]>"]
 edition = "2018"
 license-file = "LICENSE"
@@ -17,12 +17,15 @@ regex = "1"
 pest = "2.0"
 pest_derive = "2.0"
 thiserror = "1.0.50"
-lazy_static = "1.4"
-once_cell = "1.19.0"
 
 [dev-dependencies]
+lazy_static = "1.0"
 criterion = "0.5.1"
 
 [[bench]]
-name = "regex_bench"
-harness = false
+name = "regex"
+harness = false
+
+[[bench]]
+name = "equal"
+harness = false

README.md

@@ -389,50 +389,7 @@ fn test() {
 ** If the value has been modified during the search, there is no way to find a path of a new value. 
 It can happen if we try to find a length() of array, for in stance.**
 
-## Configuration
 
-The JsonPath provides a wat to configure the search by using `JsonPathConfig`.
-
-```rust
-pub fn main() {
-  let cfg = JsonPathConfig::new(RegexCache::Implemented(DefaultRegexCacheInst::default()));
-}
-```
-
-### Regex cache
-The configuration provides an ability to use a regex cache to improve the [performance](https://github.com/besok/jsonpath-rust/issues/61)
-
-To instantiate the cache needs to use `RegexCache` enum with the implementation of the trait `RegexCacheInst`.
-Default implementation `DefaultRegexCacheInst` uses `Arc<Mutex<HashMap<String,Regex>>>`.
-The pair of Box<Value> or Value  and config can be used:
-```rust
-pub fn main(){
-  let cfg = JsonPathConfig::new(RegexCache::Implemented(DefaultRegexCacheInst::default()));
-  let json = Box::new(json!({
-            "author":"abcd(Rees)",
-        }));
-
-  let _v = (json, cfg).path("$.[?(@.author ~= '.*(?i)d\\(Rees\\)')]")
-          .expect("the path is correct");
-
-
-}
-```
-or using `JsonPathFinder` :
-
-```rust
-fn main() {
-    let cfg = JsonPathConfig::new(RegexCache::Implemented(DefaultRegexCacheInst::default()));
-    let finder = JsonPathFinder::from_str_with_cfg(
-        r#"{"first":{"second":[{"active":1},{"passive":1}]}}"#,
-        "$.first.second[?(@.active)]",
-        cfg,
-    ).unwrap();
-    let slice_of_data: Vec<&Value> = finder.find_slice();
-    let js = json!({"active":1});
-    assert_eq!(slice_of_data, vec![JsonPathValue::Slice(&js, "$.first.second[0]".to_string())]);
-}
-```
 
 ## The structure
 

benches/equal.rs

@@ -0,0 +1,41 @@
+use criterion::{criterion_group, criterion_main, Criterion};
+use jsonpath_rust::{JsonPathInst, JsonPathQuery};
+use serde_json::json;
+use std::str::FromStr;
+
+struct SearchData {
+    json: serde_json::Value,
+    path: JsonPathInst,
+}
+
+const PATH: &'static str = "$.[?(@.author == 'abcd(Rees)')]";
+
+fn equal_perf_test_with_reuse(cfg: &SearchData) {
+    let _v = jsonpath_rust::find(&cfg.path, &cfg.json);
+}
+
+fn equal_perf_test_without_reuse() {
+    let json = Box::new(json!({
+        "author":"abcd(Rees)",
+    }));
+
+    let _v = json.path(PATH).expect("the path is correct");
+}
+
+pub fn criterion_benchmark(c: &mut Criterion) {
+    let data = SearchData {
+        json: json!({
+            "author":"abcd(Rees)",
+        }),
+        path: JsonPathInst::from_str(PATH).unwrap(),
+    };
+    c.bench_function("equal bench with reuse", |b| {
+        b.iter(|| equal_perf_test_with_reuse(&data))
+    });
+    c.bench_function("equal bench without reuse", |b| {
+        b.iter(|| equal_perf_test_without_reuse())
+    });
+}
+
+criterion_group!(benches, criterion_benchmark);
+criterion_main!(benches);

benches/regex.rs

@@ -0,0 +1,48 @@
+use criterion::{criterion_group, criterion_main, Criterion};
+use jsonpath_rust::{JsonPathInst, JsonPathQuery};
+use serde_json::json;
+use std::str::FromStr;
+
+struct SearchData {
+    json: serde_json::Value,
+    path: JsonPathInst,
+}
+
+const PATH: &'static str = "$.[?(@.author ~= '.*(?i)d\\(Rees\\)')]";
+
+fn regex_perf_test_with_reuse(cfg: &SearchData) {
+    let _v = jsonpath_rust::find(&cfg.path, &cfg.json);
+}
+
+fn regex_perf_test_without_reuse() {
+    let json = Box::new(json!({
+        "author":"abcd(Rees)",
+    }));
+
+    let _v = json.path(PATH).expect("the path is correct");
+}
+
+fn json_path_inst_compiling() {
+    let _v = JsonPathInst::from_str(PATH).unwrap();
+}
+
+pub fn criterion_benchmark(c: &mut Criterion) {
+    let data = SearchData {
+        json: json!({
+            "author":"abcd(Rees)",
+        }),
+        path: JsonPathInst::from_str(PATH).unwrap(),
+    };
+    c.bench_function("regex bench with reuse", |b| {
+        b.iter(|| regex_perf_test_with_reuse(&data))
+    });
+    c.bench_function("regex bench without reuse", |b| {
+        b.iter(|| regex_perf_test_without_reuse())
+    });
+    c.bench_function("JsonPathInst generation", |b| {
+        b.iter(|| json_path_inst_compiling())
+    });
+}
+
+criterion_group!(benches, criterion_benchmark);
+criterion_main!(benches);