searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-04 20:37:15 +02:00
Code Issues Releases Wiki Activity

Introduce the new Sort criterion and AscDesc enum

Browse source
This commit is contained in:
Kerollmops 2021-08-17 15:05:00 +02:00
parent 5b88df508e
commit 687cd2e205
No known key found for this signature in database
GPG key ID: 92ADA4E935E71FA4
4 changed files with 64 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
milli/src/search/criteria/mod.rs
View file

@ -1,5 +1,6 @@
use std::borrow::Cow;
use std::collections::HashMap;
use std::str::FromStr;
use roaring::RoaringBitmap;
@ -273,8 +274,9 @@ impl<'t> CriteriaBuilder<'t> {
query_tree: Option<Operation>,
primitive_query: Option<Vec<PrimitiveQueryPart>>,
filtered_candidates: Option<RoaringBitmap>,
sort_criteria: Option<Vec<String>>,
) -> Result<Final<'t>> {
use crate::criterion::Criterion as Name;
use crate::criterion::{AscDesc as AscDescName, Criterion as Name};
let primitive_query = primitive_query.unwrap_or_default();
@ -282,8 +284,30 @@ impl<'t> CriteriaBuilder<'t> {
Box::new(Initial::new(query_tree, filtered_candidates)) as Box<dyn Criterion>;
for name in self.index.criteria(&self.rtxn)? {
criterion = match name {
Name::Typo => Box::new(Typo::new(self, criterion)),
Name::Words => Box::new(Words::new(self, criterion)),
Name::Typo => Box::new(Typo::new(self, criterion)),
Name::Sort => match sort_criteria {
Some(ref sort_criteria) => {
for text in sort_criteria {
criterion = match AscDescName::from_str(text)? {
AscDescName::Asc(field) => Box::new(AscDesc::asc(
&self.index,
&self.rtxn,
criterion,
field,
)?),
AscDescName::Desc(field) => Box::new(AscDesc::desc(
&self.index,
&self.rtxn,
criterion,
field,
)?),
};
}
criterion
}
None => criterion,
},
Name::Proximity => Box::new(Proximity::new(self, criterion)),
Name::Attribute => Box::new(Attribute::new(self, criterion)),
Name::Exactness => Box::new(Exactness::new(self, criterion, &primitive_query)?),

8
milli/src/search/mod.rs
View file

@ -135,7 +135,13 @@ impl<'a> Search<'a> {
};
let criteria_builder = criteria::CriteriaBuilder::new(self.rtxn, self.index)?;
let criteria = criteria_builder.build(query_tree, primitive_query, filtered_candidates)?;
let sort_criteria = None;
let criteria = criteria_builder.build(
query_tree,
primitive_query,
filtered_candidates,
sort_criteria,
)?;
match self.index.distinct_field(self.rtxn)? {
None => self.perform_sort(NoopDistinct, matching_words, criteria),