snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-10-31 16:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove filter pre-check

Browse Source
This commit is contained in:
ManyTheFish
2025-03-10 13:55:54 +01:00
parent c9a4c6ed96
commit b12ffd1356
1 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,9 +12,7 @@ use serde_json::Value;
use super::facet_range_search; use super::facet_range_search;
use crate::constants::RESERVED_GEO_FIELD_NAME; use crate::constants::RESERVED_GEO_FIELD_NAME;
use crate::error::{Error, UserError}; use crate::error::{Error, UserError};
use crate::filterable_attributes_rules::{ use crate::filterable_attributes_rules::{filtered_matching_patterns, matching_features};
filtered_matching_patterns, is_field_filterable, matching_features,
};
use crate::heed_codec::facet::{ use crate::heed_codec::facet::{
FacetGroupKey, FacetGroupKeyCodec, FacetGroupValue, FacetGroupValueCodec, OrderedF64Codec, FacetGroupKey, FacetGroupKeyCodec, FacetGroupValue, FacetGroupValueCodec, OrderedF64Codec,
}; };
@@ -233,24 +231,8 @@ impl<'a> Filter<'a> {
impl<'a> Filter<'a> { impl<'a> Filter<'a> {
pub fn evaluate(&self, rtxn: &heed::RoTxn<'_>, index: &Index) -> Result<RoaringBitmap> { pub fn evaluate(&self, rtxn: &heed::RoTxn<'_>, index: &Index) -> Result<RoaringBitmap> {
// to avoid doing this for each recursive call we're going to do it ONCE ahead of time
let fields_ids_map = index.fields_ids_map(rtxn)?; let fields_ids_map = index.fields_ids_map(rtxn)?;
let filterable_attributes_rules = index.filterable_attributes_rules(rtxn)?; let filterable_attributes_rules = index.filterable_attributes_rules(rtxn)?;
for fid in self.condition.fids(MAX_FILTER_DEPTH) {
let attribute = fid.value();
if is_field_filterable(attribute, &filterable_attributes_rules) {
continue;
}
// If the field is not filterable, return an error
return Err(fid.as_external_error(FilterError::AttributeNotFilterable {
attribute,
filterable_patterns: filtered_matching_patterns(
&filterable_attributes_rules,
&|features| features.is_filterable(),
),
}))?;
}
self.inner_evaluate(rtxn, index, &fields_ids_map, &filterable_attributes_rules, None) self.inner_evaluate(rtxn, index, &fields_ids_map, &filterable_attributes_rules, None)
} }
@@ -484,15 +466,22 @@ impl<'a> Filter<'a> {
} }
} }
FilterCondition::In { fid, els } => { FilterCondition::In { fid, els } => {
let Some((rule_index, features)) =
matching_features(fid.value(), filterable_attribute_rules)
.filter(|(_, features)| features.is_filterable())
else {
// If the field is not filterable, return an error
return Err(fid.as_external_error(FilterError::AttributeNotFilterable {
attribute: fid.value(),
filterable_patterns: filtered_matching_patterns(
filterable_attribute_rules,
&|features| features.is_filterable(),
),
}))?;
};
let Some(field_id) = field_ids_map.id(fid.value()) else { let Some(field_id) = field_ids_map.id(fid.value()) else {
return Ok(RoaringBitmap::new()); return Ok(RoaringBitmap::new());
}; };
let Some((rule_index, features)) =
matching_features(fid.value(), filterable_attribute_rules)
else {
return Ok(RoaringBitmap::new());
};
els.iter() els.iter()
.map(|el| Condition::Equal(el.clone())) .map(|el| Condition::Equal(el.clone()))
.map(|op| { .map(|op| {
@@ -503,12 +492,20 @@ impl<'a> Filter<'a> {
.union() .union()
} }
FilterCondition::Condition { fid, op } => { FilterCondition::Condition { fid, op } => {
let Some(field_id) = field_ids_map.id(fid.value()) else {
return Ok(RoaringBitmap::new());
};
let Some((rule_index, features)) = let Some((rule_index, features)) =
matching_features(fid.value(), filterable_attribute_rules) matching_features(fid.value(), filterable_attribute_rules)
.filter(|(_, features)| features.is_filterable())
else { else {
// If the field is not filterable, return an error
return Err(fid.as_external_error(FilterError::AttributeNotFilterable {
attribute: fid.value(),
filterable_patterns: filtered_matching_patterns(
filterable_attribute_rules,
&|features| features.is_filterable(),
),
}))?;
};
let Some(field_id) = field_ids_map.id(fid.value()) else {
return Ok(RoaringBitmap::new()); return Ok(RoaringBitmap::new());
}; };