searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-26 14:54:27 +01:00
Code Issues Releases Wiki Activity

Change the depth function to return the token depth

Browse Source
This commit is contained in:
Clément Renault 2021-12-07 15:16:29 +01:00
parent 57502fcf6a
commit 49c2db9485
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
filter-parser/src/lib.rs
View File

@ -113,14 +113,19 @@ pub enum FilterCondition<'a> {
} }
impl<'a> FilterCondition<'a> { impl<'a> FilterCondition<'a> {
pub fn depth(&self) -> usize { /// Returns the first token found at the specified depth, `None` if no token at this depth.
pub fn token_at_depth(&self, depth: usize) -> Option<&Token> {
match self { match self {
FilterCondition::Condition { .. } => 1, FilterCondition::Condition { fid, .. } if depth == 0 => Some(fid),
FilterCondition::Or(left, right) => 1 + left.depth().max(right.depth()), FilterCondition::Or(left, right) => {
FilterCondition::And(left, right) => 1 + left.depth().max(right.depth()), left.token_at_depth(depth - 1).or_else(|| right.token_at_depth(depth - 1))
FilterCondition::GeoLowerThan { .. } => 1, }
FilterCondition::GeoGreaterThan { .. } => 1, FilterCondition::And(left, right) => {
FilterCondition::Empty => 0, left.token_at_depth(depth - 1).or_else(|| right.token_at_depth(depth - 1))
}
FilterCondition::GeoLowerThan { point: [point, _], .. } if depth == 0 => Some(point),
FilterCondition::GeoGreaterThan { point: [point, _], .. } if depth == 0 => Some(point),
_ => None,
} }
} }
@ -599,6 +604,6 @@ pub mod tests {
#[test] #[test]
fn depth() { fn depth() {
let filter = FilterCondition::parse("account_ids=1 OR account_ids=2 OR account_ids=3 OR account_ids=4 OR account_ids=5 OR account_ids=6").unwrap(); let filter = FilterCondition::parse("account_ids=1 OR account_ids=2 OR account_ids=3 OR account_ids=4 OR account_ids=5 OR account_ids=6").unwrap();
assert_eq!(filter.depth(), 6); assert!(filter.token_at_depth(5).is_some());
} }
} }