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

cargo fmt

Browse Source
This commit is contained in:
Loïc Lecrenier 2023-03-20 09:30:10 +01:00
parent 65474c8de5
commit 5b50e49522
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,10 @@ use roaring::RoaringBitmap;
use super::logger::SearchLogger; use super::logger::SearchLogger;
use super::{RankingRule, RankingRuleOutput, RankingRuleQueryTrait, SearchContext}; use super::{RankingRule, RankingRuleOutput, RankingRuleQueryTrait, SearchContext};
use crate::heed_codec::facet::FacetGroupKeyCodec;
use crate::heed_codec::ByteSliceRefCodec;
use crate::search::facet::{ascending_facet_sort, descending_facet_sort};
use crate::{FieldId, Index, Result};
pub trait RankingRuleOutputIter<'ctx, Query> { pub trait RankingRuleOutputIter<'ctx, Query> {
fn next_bucket(&mut self) -> Result<Option<RankingRuleOutput<Query>>>; fn next_bucket(&mut self) -> Result<Option<RankingRuleOutput<Query>>>;
@ -24,15 +28,6 @@ impl<'ctx, Query> RankingRuleOutputIter<'ctx, Query> for RankingRuleOutputIterWr
} }
} }
use crate::{
// facet::FacetType,
heed_codec::{facet::FacetGroupKeyCodec, ByteSliceRefCodec},
search::facet::{ascending_facet_sort, descending_facet_sort},
FieldId,
Index,
Result,
};
pub struct Sort<'ctx, Query> { pub struct Sort<'ctx, Query> {
field_name: String, field_name: String,
field_id: Option<FieldId>, field_id: Option<FieldId>,
@ -64,7 +59,7 @@ impl<'ctx, Query: RankingRuleQueryTrait> RankingRule<'ctx, Query> for Sort<'ctx,
ctx: &mut SearchContext<'ctx>, ctx: &mut SearchContext<'ctx>,
_logger: &mut dyn SearchLogger<Query>, _logger: &mut dyn SearchLogger<Query>,
parent_candidates: &RoaringBitmap, parent_candidates: &RoaringBitmap,
parent_query_graph: &Query, parent_query: &Query,
) -> Result<()> { ) -> Result<()> {
let iter: RankingRuleOutputIterWrapper<Query> = match self.field_id { let iter: RankingRuleOutputIterWrapper<Query> = match self.field_id {
Some(field_id) => { Some(field_id) => {
@ -109,7 +104,7 @@ impl<'ctx, Query: RankingRuleQueryTrait> RankingRule<'ctx, Query> for Sort<'ctx,
(itertools::Either::Right(number_iter), itertools::Either::Right(string_iter)) (itertools::Either::Right(number_iter), itertools::Either::Right(string_iter))
}; };
let query_graph = parent_query_graph.clone(); let query_graph = parent_query.clone();
RankingRuleOutputIterWrapper::new(Box::new(number_iter.chain(string_iter).map( RankingRuleOutputIterWrapper::new(Box::new(number_iter.chain(string_iter).map(
move |r| { move |r| {
let (docids, _) = r?; let (docids, _) = r?;
@ -119,7 +114,7 @@ impl<'ctx, Query: RankingRuleQueryTrait> RankingRule<'ctx, Query> for Sort<'ctx,
} }
None => RankingRuleOutputIterWrapper::new(Box::new(std::iter::empty())), None => RankingRuleOutputIterWrapper::new(Box::new(std::iter::empty())),
}; };
self.original_query = Some(parent_query_graph.clone()); self.original_query = Some(parent_query.clone());
self.iter = Some(iter); self.iter = Some(iter);
Ok(()) Ok(())
} }