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

Change the criterion output that cannot fail

Browse Source
This commit is contained in:
Kerollmops
2021-03-03 18:16:13 +01:00
parent 1fc25148da
commit 2cc4a467a6
4 changed files with 28 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
milli/src/search/criteria/mod.rs
View File

@ -138,9 +138,9 @@ impl<'t> CriteriaBuilder<'t> {
for name in self.index.criteria(&self.rtxn)? {
criterion = Some(match criterion.take() {
Some(father) => match name {
Name::Typo => Box::new(Typo::new(self, father)?),
Name::Words => Box::new(Words::new(self, father)?),
Name::Proximity => Box::new(Proximity::new(self, father)?),
Name::Typo => Box::new(Typo::new(self, father)),
Name::Words => Box::new(Words::new(self, father)),
Name::Proximity => Box::new(Proximity::new(self, father)),
Name::Asc(field) => {
let (id, facet_type) = field_id_facet_type(&field)?;
Box::new(AscDesc::asc(&self.index, &self.rtxn, father, id, facet_type)?)
@ -152,9 +152,9 @@ impl<'t> CriteriaBuilder<'t> {
_otherwise => father,
},
None => match name {
Name::Typo => Box::new(Typo::initial(self, query_tree.take(), facet_candidates.take())?),
Name::Words => Box::new(Words::initial(self, query_tree.take(), facet_candidates.take())?),
Name::Proximity => Box::new(Proximity::initial(self, query_tree.take(), facet_candidates.take())?),
Name::Typo => Box::new(Typo::initial(self, query_tree.take(), facet_candidates.take())),
Name::Words => Box::new(Words::initial(self, query_tree.take(), facet_candidates.take())),
Name::Proximity => Box::new(Proximity::initial(self, query_tree.take(), facet_candidates.take())),
Name::Asc(field) => {
let (id, facet_type) = field_id_facet_type(&field)?;
Box::new(AscDesc::initial_asc(&self.index, &self.rtxn, query_tree.take(), facet_candidates.take(), id, facet_type)?)