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

Add a better error message when the filterable attrs are empty

Browse Source 
Fixes https://github.com/meilisearch/meilisearch/issues/2140
This commit is contained in:
Bruno Casali 2022-03-15 18:12:51 -03:00
parent f04ab67083
commit 4822fe1beb
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
milli/src/search/facet/filter.rs
View File

@ -39,12 +39,22 @@ impl<'a> std::error::Error for FilterError<'a> {}
impl<'a> Display for FilterError<'a> { impl<'a> Display for FilterError<'a> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self { match self {
Self::AttributeNotFilterable { attribute, filterable } => write!( Self::AttributeNotFilterable { attribute, filterable } => {
if filterable.is_empty() {
write!(
f,
"Attribute `{}` is not filterable. This index does not have configured filterable attributes.",
attribute,
)
} else {
write!(
f, f,
"Attribute `{}` is not filterable. Available filterable attributes are: `{}`.", "Attribute `{}` is not filterable. Available filterable attributes are: `{}`.",
attribute, attribute,
filterable, filterable,
), )
}
},
Self::TooDeep => write!(f, Self::TooDeep => write!(f,
"Too many filter conditions, can't process more than {} filters.", "Too many filter conditions, can't process more than {} filters.",
MAX_FILTER_DEPTH MAX_FILTER_DEPTH
@ -554,13 +564,13 @@ mod tests {
let filter = Filter::from_str("_geoRadius(42, 150, 10)").unwrap().unwrap(); let filter = Filter::from_str("_geoRadius(42, 150, 10)").unwrap().unwrap();
let error = filter.evaluate(&rtxn, &index).unwrap_err(); let error = filter.evaluate(&rtxn, &index).unwrap_err();
assert!(error.to_string().starts_with( assert!(error.to_string().starts_with(
"Attribute `_geo` is not filterable. Available filterable attributes are: ``." "Attribute `_geo` is not filterable. This index does not have configured filterable attributes."
)); ));
let filter = Filter::from_str("dog = \"bernese mountain\"").unwrap().unwrap(); let filter = Filter::from_str("dog = \"bernese mountain\"").unwrap().unwrap();
let error = filter.evaluate(&rtxn, &index).unwrap_err(); let error = filter.evaluate(&rtxn, &index).unwrap_err();
assert!(error.to_string().starts_with( assert!(error.to_string().starts_with(
"Attribute `dog` is not filterable. Available filterable attributes are: ``." "Attribute `dog` is not filterable. This index does not have configured filterable attributes."
)); ));
drop(rtxn); drop(rtxn);