snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-02-17 00:00:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge #3531

Browse Source 
3531: V1.0.2 changes r=Kerollmops a=ManyTheFish

# Pull Request

## Related issue
Fixes #3517 
Fixes #3526 
Fixes #3521

## What does this PR do?
- update milli
- report the changes done in the following PR: https://github.com/meilisearch/meilisearch/pull/3530



Co-authored-by: ManyTheFish <many@meilisearch.com>
This commit is contained in:
bors[bot] 2023-02-23 13:07:49 +00:00 committed by GitHub
commit 55a13c4bcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Cargo.lock generated
View File

@ -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",

2
meilisearch-types/Cargo.toml
View File

@ -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"

5
meilisearch/src/search.rs
View File

@ -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);