snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-09-08 13:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take sort criteria from the request

Browse Source
This commit is contained in:
Mubelotix
2025-06-25 16:41:08 +02:00
parent 6e0526090a
commit b05cb80803
3 changed files with 79 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/milli/src/search/new/mod.rs
View File

@ -638,7 +638,7 @@ pub fn execute_vector_search(
time_budget: TimeBudget,
ranking_score_threshold: Option<f64>,
) -> Result<PartialSearchResult> {
check_sort_criteria(ctx, sort_criteria.as_ref())?;
check_sort_criteria(ctx.index, ctx.txn, sort_criteria.as_deref())?;
// FIXME: input universe = universe & documents_with_vectors
// for now if we're computing embeddings for ALL documents, we can assume that this is just universe
@ -702,7 +702,7 @@ pub fn execute_search(
ranking_score_threshold: Option<f64>,
locales: Option<&Vec<Language>>,
) -> Result<PartialSearchResult> {
check_sort_criteria(ctx, sort_criteria.as_ref())?;
check_sort_criteria(ctx.index, ctx.txn, sort_criteria.as_deref())?;
let mut used_negative_operator = false;
let mut located_query_terms = None;
@ -872,9 +872,10 @@ pub fn execute_search(
})
}
fn check_sort_criteria(
ctx: &SearchContext<'_>,
sort_criteria: Option<&Vec<AscDesc>>,
pub(crate) fn check_sort_criteria(
index: &Index,
rtxn: &RoTxn<'_>,
sort_criteria: Option<&[AscDesc]>,
) -> Result<()> {
let sort_criteria = if let Some(sort_criteria) = sort_criteria {
sort_criteria
@ -888,19 +889,19 @@ fn check_sort_criteria(
// We check that the sort ranking rule exists and throw an
// error if we try to use it and that it doesn't.
let sort_ranking_rule_missing = !ctx.index.criteria(ctx.txn)?.contains(&crate::Criterion::Sort);
let sort_ranking_rule_missing = !index.criteria(rtxn)?.contains(&crate::Criterion::Sort);
if sort_ranking_rule_missing {
return Err(UserError::SortRankingRuleMissing.into());
}
// We check that we are allowed to use the sort criteria, we check
// that they are declared in the sortable fields.
let sortable_fields = ctx.index.sortable_fields(ctx.txn)?;
let sortable_fields = index.sortable_fields(rtxn)?;
for asc_desc in sort_criteria {
match asc_desc.member() {
Member::Field(ref field) if !crate::is_faceted(field, &sortable_fields) => {
let (valid_fields, hidden_fields) =
ctx.index.remove_hidden_fields(ctx.txn, sortable_fields)?;
index.remove_hidden_fields(rtxn, sortable_fields)?;
return Err(UserError::InvalidSortableAttribute {
field: field.to_string(),
@ -911,7 +912,7 @@ fn check_sort_criteria(
}
Member::Geo(_) if !sortable_fields.contains(RESERVED_GEO_FIELD_NAME) => {
let (valid_fields, hidden_fields) =
ctx.index.remove_hidden_fields(ctx.txn, sortable_fields)?;
index.remove_hidden_fields(rtxn, sortable_fields)?;
return Err(UserError::InvalidSortableAttribute {
field: RESERVED_GEO_FIELD_NAME.to_string(),