diff --git a/milli/src/search/facet/filter.rs b/milli/src/search/facet/filter.rs index 932fd21d9..9388cfa33 100644 --- a/milli/src/search/facet/filter.rs +++ b/milli/src/search/facet/filter.rs @@ -1,3 +1,4 @@ +use std::collections::HashSet; use std::fmt::{Debug, Display}; use std::ops::Bound::{self, Excluded, Included}; use std::ops::Deref; @@ -27,7 +28,7 @@ pub struct Filter<'a> { #[derive(Debug)] enum FilterError<'a> { - AttributeNotFilterable { attribute: &'a str, filterable: String }, + AttributeNotFilterable { attribute: &'a str, filterable_fields: HashSet }, BadGeo(&'a str), BadGeoLat(f64), BadGeoLng(f64), @@ -39,19 +40,21 @@ impl<'a> std::error::Error for FilterError<'a> {} impl<'a> Display for FilterError<'a> { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { - Self::AttributeNotFilterable { attribute, filterable } => { - if filterable.is_empty() { + Self::AttributeNotFilterable { attribute, filterable_fields } => { + if filterable_fields.is_empty() { write!( f, "Attribute `{}` is not filterable. This index does not have configured filterable attributes.", attribute, ) } else { + let filterables_list = filterable_fields.iter().map(AsRef::as_ref).collect::>().join(" "); + write!( f, "Attribute `{}` is not filterable. Available filterable attributes are: `{}`.", attribute, - filterable, + filterables_list, ) } }, @@ -372,10 +375,7 @@ impl<'a> Filter<'a> { return Err(fid.as_external_error( FilterError::AttributeNotFilterable { attribute, - filterable: filterable_fields - .into_iter() - .collect::>() - .join(" "), + filterable_fields, }, ))?; } @@ -426,7 +426,7 @@ impl<'a> Filter<'a> { } else { return Err(point[0].as_external_error(FilterError::AttributeNotFilterable { attribute: "_geo", - filterable: filterable_fields.into_iter().collect::>().join(" "), + filterable_fields, }))?; } }