From 3a3acd5126846bb21626cc8d353376d164ec15f4 Mon Sep 17 00:00:00 2001 From: ManyTheFish Date: Wed, 22 Feb 2023 18:09:10 +0100 Subject: [PATCH 1/2] update milli --- Cargo.lock | 16 ++++++++-------- meilisearch-types/Cargo.toml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b9d890ff4..00a2307f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1300,8 +1300,8 @@ dependencies = [ [[package]] name = "filter-parser" -version = "0.41.2" -source = "git+https://github.com/meilisearch/milli.git?tag=v0.41.2#f79dbdff6708bcac2b5243646fd1ef7fd1c3c08f" +version = "0.41.3" +source = "git+https://github.com/meilisearch/milli.git?tag=v0.41.3#e021bc119effbfad3fb8ec2ae57c99c1f45cb08b" dependencies = [ "nom", "nom_locate", @@ -1319,8 +1319,8 @@ dependencies = [ [[package]] name = "flatten-serde-json" -version = "0.41.2" -source = "git+https://github.com/meilisearch/milli.git?tag=v0.41.2#f79dbdff6708bcac2b5243646fd1ef7fd1c3c08f" +version = "0.41.3" +source = "git+https://github.com/meilisearch/milli.git?tag=v0.41.3#e021bc119effbfad3fb8ec2ae57c99c1f45cb08b" dependencies = [ "serde_json", ] @@ -1884,8 +1884,8 @@ dependencies = [ [[package]] name = "json-depth-checker" -version = "0.41.2" -source = "git+https://github.com/meilisearch/milli.git?tag=v0.41.2#f79dbdff6708bcac2b5243646fd1ef7fd1c3c08f" +version = "0.41.3" +source = "git+https://github.com/meilisearch/milli.git?tag=v0.41.3#e021bc119effbfad3fb8ec2ae57c99c1f45cb08b" dependencies = [ "serde_json", ] @@ -2433,8 +2433,8 @@ dependencies = [ [[package]] name = "milli" -version = "0.41.2" -source = "git+https://github.com/meilisearch/milli.git?tag=v0.41.2#f79dbdff6708bcac2b5243646fd1ef7fd1c3c08f" +version = "0.41.3" +source = "git+https://github.com/meilisearch/milli.git?tag=v0.41.3#e021bc119effbfad3fb8ec2ae57c99c1f45cb08b" dependencies = [ "bimap", "bincode", diff --git a/meilisearch-types/Cargo.toml b/meilisearch-types/Cargo.toml index 7d07313cc..ede4d412d 100644 --- a/meilisearch-types/Cargo.toml +++ b/meilisearch-types/Cargo.toml @@ -16,7 +16,7 @@ file-store = { path = "../file-store" } flate2 = "1.0.24" fst = "0.4.7" memmap2 = "0.5.7" -milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.41.2", default-features = false } +milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.41.3", default-features = false } roaring = { version = "0.10.0", features = ["serde"] } serde = { version = "1.0.145", features = ["derive"] } serde-cs = "0.2.4" From 6870c4528545a5629a6e140ebcc215f9a95a1017 Mon Sep 17 00:00:00 2001 From: ManyTheFish Date: Wed, 22 Feb 2023 18:21:47 +0100 Subject: [PATCH 2/2] create a char map diring highlighting --- meilisearch/src/search.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meilisearch/src/search.rs b/meilisearch/src/search.rs index 5cd9acee7..e02c49e47 100644 --- a/meilisearch/src/search.rs +++ b/meilisearch/src/search.rs @@ -243,9 +243,10 @@ pub fn perform_search( &displayed_ids, ); - let tokenizer = TokenizerBuilder::default().build(); + let mut tokenizer_buidler = TokenizerBuilder::default(); + tokenizer_buidler.create_char_map(true); - let mut formatter_builder = MatcherBuilder::new(matching_words, tokenizer); + let mut formatter_builder = MatcherBuilder::new(matching_words, tokenizer_buidler.build()); formatter_builder.crop_marker(query.crop_marker); formatter_builder.highlight_prefix(query.highlight_pre_tag); formatter_builder.highlight_suffix(query.highlight_post_tag);