snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-07-28 01:01:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #3461

Browse Source 
3461: Bring v1 changes into main r=curquiza a=Kerollmops

Also bring back changes in milli (the remote repository) into main done during the pre-release

Co-authored-by: Loïc Lecrenier <loic.lecrenier@me.com>
Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Co-authored-by: curquiza <curquiza@users.noreply.github.com>
Co-authored-by: Tamo <tamo@meilisearch.com>
Co-authored-by: Philipp Ahlner <philipp@ahlner.com>
Co-authored-by: Kerollmops <clement@meilisearch.com>
This commit is contained in:
bors[bot]
2023-02-07 11:27:27 +00:00
committed by GitHub
parent 97fd9ac493 fbec48f56e
commit c88c3637b4
142 changed files with 7451 additions and 2398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
milli/src/search/criteria/proximity.rs
View File

@ -183,14 +183,14 @@ impl<'t> Criterion for Proximity<'t> {
}
fn resolve_candidates(
ctx: &'_ dyn Context,
ctx: &dyn Context,
query_tree: &Operation,
proximity: u8,
cache: &mut Cache,
wdcache: &mut WordDerivationsCache,
) -> Result<RoaringBitmap> {
fn resolve_operation(
ctx: &'_ dyn Context,
ctx: &dyn Context,
query_tree: &Operation,
proximity: u8,
cache: &mut Cache,
@ -244,7 +244,7 @@ fn resolve_candidates(
}
fn mdfs_pair(
ctx: &'_ dyn Context,
ctx: &dyn Context,
left: &Operation,
right: &Operation,
proximity: u8,
@ -299,7 +299,7 @@ fn resolve_candidates(
}
fn mdfs(
ctx: &'_ dyn Context,
ctx: &dyn Context,
branches: &[Operation],
proximity: u8,
cache: &mut Cache,

6
milli/src/search/criteria/typo.rs
View File

@ -240,14 +240,14 @@ fn alterate_query_tree(
}
fn resolve_candidates(
ctx: &'_ dyn Context,
ctx: &dyn Context,
query_tree: &Operation,
number_typos: u8,
cache: &mut HashMap<(Operation, u8), RoaringBitmap>,
wdcache: &mut WordDerivationsCache,
) -> Result<RoaringBitmap> {
fn resolve_operation(
ctx: &'_ dyn Context,
ctx: &dyn Context,
query_tree: &Operation,
number_typos: u8,
cache: &mut HashMap<(Operation, u8), RoaringBitmap>,
@ -277,7 +277,7 @@ fn resolve_candidates(
}
fn mdfs(
ctx: &'_ dyn Context,
ctx: &dyn Context,
branches: &[Operation],
mana: u8,
cache: &mut HashMap<(Operation, u8), RoaringBitmap>,

1
milli/src/search/facet/facet_distribution.rs
View File

@ -291,6 +291,7 @@ impl<'a> FacetDistribution<'a> {
if !invalid_fields.is_empty() {
return Err(UserError::InvalidFacetsDistribution {
invalid_facets_name: invalid_fields.into_iter().cloned().collect(),
valid_facets_name: filterable_fields.into_iter().collect(),
}
.into());
} else {