snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-27 04:25:06 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

create the _geoRadius filter

Browse Source
This commit is contained in:
Irevoire 2021-08-26 16:38:29 +02:00 committed by Tamo
parent 6d70978edc
commit 4b459768a0
No known key found for this signature in database
GPG Key ID: 20CD8020AFA88D69
1 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
milli/src/search/facet/filter_condition.rs
View File

@ -32,6 +32,8 @@ pub enum Operator {
LowerThan(f64),
LowerThanOrEqual(f64),
Between(f64, f64),
GeoLowerThan([f64; 2], f64),
GeoGreaterThan([f64; 2], f64),
}
impl Operator {
@ -46,6 +48,8 @@ impl Operator {
LowerThan(n) => (GreaterThanOrEqual(n), None),
LowerThanOrEqual(n) => (GreaterThan(n), None),
Between(n, m) => (LowerThan(n), Some(GreaterThan(m))),
GeoLowerThan(point, distance) => (GeoGreaterThan(point, distance), None),
GeoGreaterThan(point, distance) => (GeoLowerThan(point, distance), None),
}
}
}
@ -131,6 +135,7 @@ impl FilterCondition {
Rule::leq => Ok(Self::lower_than_or_equal(fim, ff, pair)?),
Rule::less => Ok(Self::lower_than(fim, ff, pair)?),
Rule::between => Ok(Self::between(fim, ff, pair)?),
Rule::geo_radius => Ok(Self::geo_radius(fim, pair)?),
Rule::not => Ok(Self::from_pairs(fim, ff, pair.into_inner())?.negate()),
Rule::prgm => Self::from_pairs(fim, ff, pair.into_inner()),
Rule::term => Self::from_pairs(fim, ff, pair.into_inner()),
@ -156,6 +161,23 @@ impl FilterCondition {
}
}
fn geo_radius(fields_ids_map: &FieldsIdsMap, item: Pair<Rule>) -> Result<FilterCondition> {
let mut items = item.into_inner();
let fid = match fields_ids_map.id("_geo") {
Some(fid) => fid,
None => return Ok(Empty),
};
let (lat_result, _) = pest_parse(items.next().unwrap());
let (lng_result, _) = pest_parse(items.next().unwrap());
let lat = lat_result.map_err(UserError::InvalidFilter)?;
let lng = lng_result.map_err(UserError::InvalidFilter)?;
let point = [lat, lng];
let (distance_result, _) = pest_parse(items.next().unwrap());
let distance = distance_result.map_err(UserError::InvalidFilter)?;
Ok(Operator(fid, GeoLowerThan(point, distance)))
}
fn between(
fields_ids_map: &FieldsIdsMap,
filterable_fields: &HashSet<String>,
@ -440,6 +462,32 @@ impl FilterCondition {
LowerThan(val) => (Included(f64::MIN), Excluded(*val)),
LowerThanOrEqual(val) => (Included(f64::MIN), Included(*val)),
Between(left, right) => (Included(*left), Included(*right)),
GeoLowerThan(point, distance) => {
let mut result = RoaringBitmap::new();
let rtree = match index.geo_rtree(rtxn)? {
Some(rtree) => rtree,
None => return Ok(result),
};
let iter = rtree
.nearest_neighbor_iter_with_distance_2(point)
.take_while(|(_, dist)| dist <= distance);
iter.for_each(|(point, _)| drop(result.insert(point.data)));
return Ok(result);
}
GeoGreaterThan(point, distance) => {
let result = Self::evaluate_operator(
rtxn,
index,
numbers_db,
strings_db,
field_id,
&GeoLowerThan(point.clone(), *distance),
)?;
let geo_faceted_doc_ids = index.geo_faceted_documents_ids(rtxn)?;
return Ok(geo_faceted_doc_ids - result);
}
};
// Ask for the biggest value that can exist for this specific field, if it exists