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

Return a new error when the sort criteria is not sortable

Browse source
This commit is contained in:
Kerollmops 2021-08-17 16:14:56 +02:00
parent 71602e0f1b
commit 1b7f6ea1e7
No known key found for this signature in database
GPG key ID: 92ADA4E935E71FA4
3 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@ pub use self::facet::{FacetDistribution, FacetNumberIter, FilterCondition, Opera
pub use self::matching_words::MatchingWords;
use self::query_tree::QueryTreeBuilder;
use crate::criterion::AscDesc;
use crate::error::UserError;
use crate::search::criteria::r#final::{Final, FinalResult};
use crate::{DocumentId, Index, Result};
@ -142,13 +143,28 @@ impl<'a> Search<'a> {
None => MatchingWords::default(),
};
// We check that we are allowed to use the sort criteria, we check
// that they are declared in the sortable fields.
let sortable_fields = self.index.sortable_fields(self.rtxn)?;
if let Some(sort_criteria) = &self.sort_criteria {
for asc_desc in sort_criteria {
let field = asc_desc.field();
if !sortable_fields.contains(field) {
return Err(UserError::InvalidSortableAttribute {
field: field.to_string(),
valid_fields: sortable_fields,
}
.into());
}
}
}
let criteria_builder = criteria::CriteriaBuilder::new(self.rtxn, self.index)?;
let sort_criteria = self.sort_criteria.clone();
let criteria = criteria_builder.build(
query_tree,
primitive_query,
filtered_candidates,
sort_criteria,
self.sort_criteria.clone(),
)?;
match self.index.distinct_field(self.rtxn)? {