snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-09-18 18:56:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce identations

Browse Source
This commit is contained in:
Mubelotix
2025-08-19 13:29:19 +02:00
committed by Tamo
parent 3a0893a64d
commit 27a8088c85
1 changed files with 86 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
crates/milli/src/search/facet/filter.rs
View File

@ -617,7 +617,10 @@ impl<'a> Filter<'a> {
.union(), .union(),
FilterCondition::And(subfilters) => { FilterCondition::And(subfilters) => {
let mut subfilters_iter = subfilters.iter(); let mut subfilters_iter = subfilters.iter();
if let Some(first_subfilter) = subfilters_iter.next() { let Some(first_subfilter) = subfilters_iter.next() else {
return Ok(RoaringBitmap::new());
};
let mut bitmap = Self::inner_evaluate( let mut bitmap = Self::inner_evaluate(
&(first_subfilter.clone()).into(), &(first_subfilter.clone()).into(),
rtxn, rtxn,
@ -643,15 +646,21 @@ impl<'a> Filter<'a> {
)?; )?;
} }
Ok(bitmap) Ok(bitmap)
} else {
Ok(RoaringBitmap::new())
}
} }
FilterCondition::VectorExists { fid: _, embedder, filter } => { FilterCondition::VectorExists { fid: _, embedder, filter } => {
super::filter_vector::evaluate(rtxn, index, universe, embedder.clone(), filter) super::filter_vector::evaluate(rtxn, index, universe, embedder.clone(), filter)
} }
FilterCondition::GeoLowerThan { point, radius } => { FilterCondition::GeoLowerThan { point, radius } => {
if index.is_geo_filtering_enabled(rtxn)? { if !index.is_geo_filtering_enabled(rtxn)? {
return Err(point[0].as_external_error(FilterError::AttributeNotFilterable {
attribute: RESERVED_GEO_FIELD_NAME,
filterable_patterns: filtered_matching_patterns(
filterable_attribute_rules,
&|features| features.is_filterable(),
),
}))?;
}
let base_point: [f64; 2] = let base_point: [f64; 2] =
[point[0].parse_finite_float()?, point[1].parse_finite_float()?]; [point[0].parse_finite_float()?, point[1].parse_finite_float()?];
if !(-90.0..=90.0).contains(&base_point[0]) { if !(-90.0..=90.0).contains(&base_point[0]) {
@ -678,15 +687,6 @@ impl<'a> Filter<'a> {
.collect(); .collect();
Ok(result) Ok(result)
} else {
Err(point[0].as_external_error(FilterError::AttributeNotFilterable {
attribute: RESERVED_GEO_FIELD_NAME,
filterable_patterns: filtered_matching_patterns(
filterable_attribute_rules,
&|features| features.is_filterable(),
),
}))?
}
} }
FilterCondition::GeoBoundingBox { top_right_point, bottom_left_point } => { FilterCondition::GeoBoundingBox { top_right_point, bottom_left_point } => {
let top_right: [f64; 2] = [ let top_right: [f64; 2] = [
@ -858,7 +858,18 @@ impl<'a> Filter<'a> {
} }
} }
FilterCondition::GeoPolygon { points } => { FilterCondition::GeoPolygon { points } => {
if index.is_geojson_filtering_enabled(rtxn)? { if !index.is_geojson_filtering_enabled(rtxn)? {
return Err(points[0][0].as_external_error(
FilterError::AttributeNotFilterable {
attribute: RESERVED_GEOJSON_FIELD_NAME,
filterable_patterns: filtered_matching_patterns(
filterable_attribute_rules,
&|features| features.is_filterable(),
),
},
))?;
}
let polygon = geo_types::Polygon::new( let polygon = geo_types::Polygon::new(
geo_types::LineString( geo_types::LineString(
points points
@ -881,15 +892,6 @@ impl<'a> Filter<'a> {
let result = roaring::RoaringBitmap::from_iter(result); // TODO: Remove once we update roaring let result = roaring::RoaringBitmap::from_iter(result); // TODO: Remove once we update roaring
Ok(result) Ok(result)
} else {
Err(points[0][0].as_external_error(FilterError::AttributeNotFilterable {
attribute: RESERVED_GEOJSON_FIELD_NAME,
filterable_patterns: filtered_matching_patterns(
filterable_attribute_rules,
&|features| features.is_filterable(),
),
}))?
}
} }
} }
} }