snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 12:05:05 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Update new sort ranking rule after rebasing

Browse Source
This commit is contained in:
Loïc Lecrenier 2023-03-20 09:26:11 +01:00
parent fbb1ba3de0
commit 65474c8de5
1 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
milli/src/search/new/sort.rs
View File

@ -68,30 +68,52 @@ impl<'ctx, Query: RankingRuleQueryTrait> RankingRule<'ctx, Query> for Sort<'ctx,
) -> Result<()> { ) -> Result<()> {
let iter: RankingRuleOutputIterWrapper<Query> = match self.field_id { let iter: RankingRuleOutputIterWrapper<Query> = match self.field_id {
Some(field_id) => { Some(field_id) => {
let make_iter = let number_db = ctx
if self.is_ascending { ascending_facet_sort } else { descending_facet_sort }; .index
.facet_id_f64_docids
.remap_key_type::<FacetGroupKeyCodec<ByteSliceRefCodec>>();
let string_db = ctx
.index
.facet_id_string_docids
.remap_key_type::<FacetGroupKeyCodec<ByteSliceRefCodec>>();
let number_iter = make_iter( let (number_iter, string_iter) = if self.is_ascending {
ctx.txn, let number_iter = ascending_facet_sort(
ctx.index ctx.txn,
.facet_id_f64_docids number_db,
.remap_key_type::<FacetGroupKeyCodec<ByteSliceRefCodec>>(), field_id,
field_id, parent_candidates.clone(),
parent_candidates.clone(), )?;
)?; let string_iter = ascending_facet_sort(
ctx.txn,
string_db,
field_id,
parent_candidates.clone(),
)?;
(itertools::Either::Left(number_iter), itertools::Either::Left(string_iter))
} else {
let number_iter = descending_facet_sort(
ctx.txn,
number_db,
field_id,
parent_candidates.clone(),
)?;
let string_iter = descending_facet_sort(
ctx.txn,
string_db,
field_id,
parent_candidates.clone(),
)?;
(itertools::Either::Right(number_iter), itertools::Either::Right(string_iter))
};
let string_iter = make_iter(
ctx.txn,
ctx.index
.facet_id_string_docids
.remap_key_type::<FacetGroupKeyCodec<ByteSliceRefCodec>>(),
field_id,
parent_candidates.clone(),
)?;
let query_graph = parent_query_graph.clone(); let query_graph = parent_query_graph.clone();
RankingRuleOutputIterWrapper::new(Box::new(number_iter.chain(string_iter).map( RankingRuleOutputIterWrapper::new(Box::new(number_iter.chain(string_iter).map(
move |docids| { move |r| {
Ok(RankingRuleOutput { query: query_graph.clone(), candidates: docids? }) let (docids, _) = r?;
Ok(RankingRuleOutput { query: query_graph.clone(), candidates: docids })
}, },
))) )))
} }