use serde_json_borrow instead of serde_json::Value

quickwit-oss · May 27, 2024 · 6c7c731 · 6c7c731
1 parent 9ad451e
commit 6c7c731
Show file tree

Hide file tree

Showing 12 changed files with 326 additions and 163 deletions.
diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock
diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml
@@ -210,6 +210,7 @@ sea-query-binder = { version = "0.5", features = [
 # ^1.0.184 due to serde-rs/serde#2538
 serde = { version = "1.0.184", features = ["derive", "rc"] }
 serde_json = "1.0"
+serde_json_borrow = { version = "0.5" }
 serde_qs = { version = "0.12", features = ["warp"] }
 serde_with = "3.8.0"
 serde_yaml = "0.9"
@@ -318,7 +319,7 @@ quickwit-serve = { path = "quickwit-serve" }
 quickwit-storage = { path = "quickwit-storage" }
 quickwit-telemetry = { path = "quickwit-telemetry" }
 
-tantivy = { path = "../../../tantivy/compact_doc", default-features = false, features = [
+tantivy = { git = "https://github.com/quickwit-oss/tantivy/", rev = "2e3641c", default-features = false, features = [
   "lz4-compression",
   "mmap",
   "quickwit",
@@ -346,5 +347,5 @@ sasl2-sys = { git = "https://github.com/quickwit-oss/rust-sasl/", rev = "daca921
 debug = false
 
 [profile.release]
-debug = true
+#debug = true
 lto = "thin"
diff --git a/quickwit/quickwit-doc-mapper/Cargo.toml b/quickwit/quickwit-doc-mapper/Cargo.toml
@@ -23,7 +23,9 @@ once_cell = { workspace = true }
 regex = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
+serde_json_borrow = { workspace = true }
 siphasher = { workspace = true }
+time = { workspace = true }
 tantivy = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }

diff --git a/quickwit/quickwit-doc-mapper/benches/routing_expression_bench.rs b/quickwit/quickwit-doc-mapper/benches/routing_expression_bench.rs
@@ -19,7 +19,6 @@
 
 use criterion::{criterion_group, criterion_main, Criterion, Throughput};
 use quickwit_doc_mapper::{DocMapper, RoutingExpr};
-use serde_json::Value as JsonValue;
 
 const JSON_TEST_DATA: &str = include_str!("data/simple-routing-expression-bench.json");
 
@@ -48,7 +47,7 @@ pub fn simple_routing_expression_benchmark(c: &mut Criterion) {
     let doc_mapper: Box<dyn DocMapper> = serde_json::from_str(DOC_MAPPER_CONF).unwrap();
     let lines: Vec<&str> = JSON_TEST_DATA.lines().map(|line| line.trim()).collect();
 
-    let json_lines: Vec<serde_json::Map<String, JsonValue>> = lines
+    let json_lines: Vec<serde_json_borrow::Value> = lines
         .iter()
         .map(|line| serde_json::from_str(line).unwrap())
         .collect();