searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-03 20:07:09 +02:00
Code Issues Releases Wiki Activity

Removed matches_wildcard_pattern() and integrated match_pattern() into attributes_to_search_on(), updated test cases

Browse source
This commit is contained in:
Lucas Black 2025-05-18 20:24:52 -07:00
parent 3fbe1df770
commit 13b607bd68
3 changed files with 13 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/milli/src/attribute_patterns.rs
View file

@ -50,7 +50,7 @@ impl AttributePatterns {
///
/// * `pattern` - The pattern to match against.
/// * `str` - The string to match against the pattern.
fn match_pattern(pattern: &str, str: &str) -> PatternMatch {
pub fn match_pattern(pattern: &str, str: &str) -> PatternMatch {
// If the pattern is a wildcard, return Match
if pattern == "*" {
return PatternMatch::Match;

31
crates/milli/src/search/new/mod.rs
View file

@ -52,6 +52,7 @@ pub use self::geo_sort::Strategy as GeoSortStrategy;
use self::graph_based_ranking_rule::Words;
use self::interner::Interned;
use self::vector_sort::VectorSort;
use crate::attribute_patterns::{match_pattern, PatternMatch};
use crate::constants::RESERVED_GEO_FIELD_NAME;
use crate::index::PrefixSearch;
use crate::localized_attributes_rules::LocalizedFieldIds;
@ -137,7 +138,7 @@ impl<'ctx> SearchContext<'ctx> {
let matching_searchable_weights: Vec<_> = searchable_fields_weights
.iter()
.filter(|(name, _, _)| {
Self::matches_wildcard_pattern(field_name, name)
match_pattern(field_name, name) == PatternMatch::Match
})
.collect();
@ -190,34 +191,6 @@ impl<'ctx> SearchContext<'ctx> {
Ok(())
}
fn matches_wildcard_pattern(wildcard_pattern: &str, name: &str) -> bool {
let wildcard_subfields: Vec<&str> = wildcard_pattern.split(".").collect();
let name_subfields: Vec<&str> = name.split(".").collect();
// Deep wildcard matches all attributes after ('**')
if !wildcard_subfields.is_empty() && wildcard_subfields.last() == Some(&"**") {
let prefix_len = wildcard_subfields.len() - 1;
if prefix_len > name_subfields.len() {
return false;
}
return wildcard_subfields[..prefix_len]
.iter()
.zip(name_subfields.iter())
.all(|(wc, sf)| *wc == "*" || *wc == *sf);
}
// Using single wildcard ('*') should match length (e.g. 'a.*.c' matches 'a.b.c')
// where '*' can match any single segment
if wildcard_subfields.len() != name_subfields.len() {
return false;
}
wildcard_subfields.iter()
.zip(name_subfields.iter())
.all(|(wc, sf)| *wc == "*" || *wc == *sf)
}
}
#[derive(Debug, Default)]