snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 20:15:07 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

move BadGeo to FilterError

Browse Source
This commit is contained in:
Filip Bachul 2023-02-09 17:37:18 +01:00
parent 83c765ce6c
commit 7481559e8b
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,6 @@ pub struct Filter<'a> {
#[derive(Debug)] #[derive(Debug)]
pub enum ParseGeoError { pub enum ParseGeoError {
BadGeo(String),
BadGeoLat(f64), BadGeoLat(f64),
BadGeoLng(f64), BadGeoLng(f64),
BadGeoBoundingBoxTopIsBelowBottom(f64, f64), BadGeoBoundingBoxTopIsBelowBottom(f64, f64),
@ -34,10 +33,19 @@ impl std::error::Error for ParseGeoError {}
impl Display for ParseGeoError { impl Display for ParseGeoError {
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::BadGeo(keyword) => write!(f, "`{}` is a reserved keyword and thus can't be used as a filter expression. Use the `_geoRadius(latitude, longitude, distance)` or `_geoBoundingBox([latitude, longitude], [latitude, longitude])` built-in rules to filter on `_geo` field coordinates.", keyword), Self::BadGeoBoundingBoxTopIsBelowBottom(top, bottom) => {
Self::BadGeoBoundingBoxTopIsBelowBottom(top, bottom) => write!(f, "The top latitude `{top}` is below the bottom latitude `{bottom}`."), write!(f, "The top latitude `{top}` is below the bottom latitude `{bottom}`.")
Self::BadGeoLat(lat) => write!(f, "Bad latitude `{}`. Latitude must be contained between -90 and 90 degrees. ", lat), }
Self::BadGeoLng(lng) => write!(f, "Bad longitude `{}`. Longitude must be contained between -180 and 180 degrees. ", lng), Self::BadGeoLat(lat) => write!(
f,
"Bad latitude `{}`. Latitude must be contained between -90 and 90 degrees. ",
lat
),
Self::BadGeoLng(lng) => write!(
f,
"Bad longitude `{}`. Longitude must be contained between -180 and 180 degrees. ",
lng
),
} }
} }
} }
@ -46,6 +54,7 @@ impl Display for ParseGeoError {
enum FilterError<'a> { enum FilterError<'a> {
AttributeNotFilterable { attribute: &'a str, filterable_fields: HashSet<String> }, AttributeNotFilterable { attribute: &'a str, filterable_fields: HashSet<String> },
ParseGeoError(ParseGeoError), ParseGeoError(ParseGeoError),
ReservedGeo(&'a str),
Reserved(&'a str), Reserved(&'a str),
TooDeep, TooDeep,
} }
@ -87,6 +96,7 @@ impl<'a> Display for FilterError<'a> {
"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
), ),
Self::ReservedGeo(keyword) => write!(f, "`{}` is a reserved keyword and thus can't be used as a filter expression. Use the `_geoRadius(latitude, longitude, distance)` or `_geoBoundingBox([latitude, longitude], [latitude, longitude])` built-in rules to filter on `_geo` field coordinates.", keyword),
Self::Reserved(keyword) => write!( Self::Reserved(keyword) => write!(
f, f,
"`{}` is a reserved keyword and thus can't be used as a filter expression.", "`{}` is a reserved keyword and thus can't be used as a filter expression.",
@ -324,11 +334,10 @@ impl<'a> Filter<'a> {
} else { } else {
match fid.value() { match fid.value() {
attribute @ "_geo" => { attribute @ "_geo" => {
Err(fid.as_external_error(ParseGeoError::BadGeo(attribute.to_owned())))? Err(fid.as_external_error(FilterError::ReservedGeo(attribute)))?
} }
attribute if attribute.starts_with("_geoPoint(") => { attribute if attribute.starts_with("_geoPoint(") => {
Err(fid Err(fid.as_external_error(FilterError::ReservedGeo("_geoPoint")))?
.as_external_error(ParseGeoError::BadGeo("_geoPoint".to_owned())))?
} }
attribute @ "_geoDistance" => { attribute @ "_geoDistance" => {
Err(fid.as_external_error(FilterError::Reserved(attribute)))? Err(fid.as_external_error(FilterError::Reserved(attribute)))?