remove DocMapper trait (#5508)

* remove DocMapper trait * rename default docmapper to docmapper * use IgnoredAny
quickwit-oss · Oct 22, 2024 · 5de2cfa · 5de2cfa
1 parent a49f5c4
commit 5de2cfa
Show file tree

Hide file tree

Showing 35 changed files with 425 additions and 626 deletions.
diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock
diff --git a/quickwit/quickwit-config/src/index_config/mod.rs b/quickwit/quickwit-config/src/index_config/mod.rs
@@ -30,7 +30,7 @@ use chrono::Utc;
 use cron::Schedule;
 use humantime::parse_duration;
 use quickwit_common::uri::Uri;
-use quickwit_doc_mapper::{DefaultDocMapperBuilder, DocMapper, DocMapping};
+use quickwit_doc_mapper::{DocMapper, DocMapperBuilder, DocMapping};
 use quickwit_proto::types::IndexId;
 use serde::{Deserialize, Serialize};
 pub use serialize::{load_index_config_from_user_config, load_index_config_update};
@@ -473,10 +473,11 @@ impl crate::TestableForRegression for IndexConfig {
 pub fn build_doc_mapper(
     doc_mapping: &DocMapping,
     search_settings: &SearchSettings,
-) -> anyhow::Result<Arc<dyn DocMapper>> {
-    let builder = DefaultDocMapperBuilder {
+) -> anyhow::Result<Arc<DocMapper>> {
+    let builder = DocMapperBuilder {
         doc_mapping: doc_mapping.clone(),
         default_search_fields: search_settings.default_search_fields.clone(),
+        legacy_type_tag: None,
     };
     Ok(Arc::new(builder.try_build()?))
 }

diff --git a/quickwit/quickwit-config/src/index_config/serialize.rs b/quickwit/quickwit-config/src/index_config/serialize.rs
@@ -21,7 +21,7 @@ use std::collections::HashSet;
 
 use anyhow::{ensure, Context};
 use quickwit_common::uri::Uri;
-use quickwit_doc_mapper::DefaultDocMapperBuilder;
+use quickwit_doc_mapper::DocMapperBuilder;
 use quickwit_proto::types::{DocMappingUid, IndexId};
 use serde::{Deserialize, Serialize};
 use tracing::info;
@@ -103,12 +103,13 @@ pub fn load_index_config_update(
     );
 
     // verify the new mapping is coherent
-    let doc_mapper_builder = DefaultDocMapperBuilder {
+    let doc_mapper_builder = DocMapperBuilder {
         doc_mapping: new_index_config.doc_mapping.clone(),
         default_search_fields: new_index_config
             .search_settings
             .default_search_fields
             .clone(),
+        legacy_type_tag: None,
     };
     doc_mapper_builder
         .try_build()

diff --git a/quickwit/quickwit-doc-mapper/Cargo.toml b/quickwit/quickwit-doc-mapper/Cargo.toml
@@ -13,7 +13,6 @@ license.workspace = true
 [dependencies]
 anyhow = { workspace = true }
 base64 = { workspace = true }
-dyn-clone = { workspace = true }
 fnv = { workspace = true }
 hex = { workspace = true }
 indexmap = { workspace = true }
@@ -28,7 +27,6 @@ siphasher = { workspace = true }
 tantivy = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
-typetag = { workspace = true }
 utoipa = { workspace = true }
 
 quickwit-common = { workspace = true }

diff --git a/quickwit/quickwit-doc-mapper/benches/doc_to_json_bench.rs b/quickwit/quickwit-doc-mapper/benches/doc_to_json_bench.rs
@@ -36,7 +36,7 @@ const DOC_MAPPER_CONF: &str = r#"{
 }"#;
 
 pub fn simple_json_to_doc_benchmark(c: &mut Criterion) {
-    let doc_mapper: Box<dyn DocMapper> = serde_json::from_str(DOC_MAPPER_CONF).unwrap();
+    let doc_mapper: Box<DocMapper> = serde_json::from_str(DOC_MAPPER_CONF).unwrap();
     let lines: Vec<&str> = JSON_TEST_DATA.lines().map(|line| line.trim()).collect();
 
     let mut group = c.benchmark_group("simple-json-to-doc");

diff --git a/quickwit/quickwit-doc-mapper/benches/routing_expression_bench.rs b/quickwit/quickwit-doc-mapper/benches/routing_expression_bench.rs
@@ -45,7 +45,7 @@ const DOC_MAPPER_CONF: &str = r#"{
 }"#;
 
 pub fn simple_routing_expression_benchmark(c: &mut Criterion) {
-    let doc_mapper: Box<dyn DocMapper> = serde_json::from_str(DOC_MAPPER_CONF).unwrap();
+    let doc_mapper: Box<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

diff --git a/quickwit/quickwit-doc-mapper/src/default_doc_mapper/mod.rs b/quickwit/quickwit-doc-mapper/src/default_doc_mapper/mod.rs
diff --git a/.../src/default_doc_mapper/date_time_type.rs → ...c-mapper/src/doc_mapper/date_time_type.rs b/.../src/default_doc_mapper/date_time_type.rs → ...c-mapper/src/doc_mapper/date_time_type.rs
@@ -185,7 +185,7 @@ mod tests {
     use time::macros::datetime;
 
     use super::*;
-    use crate::default_doc_mapper::FieldMappingType;
+    use crate::doc_mapper::FieldMappingType;
     use crate::{Cardinality, FieldMappingEntry};
 
     #[test]