searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-12-24 13:40:31 +01:00
Code Issues Releases Wiki Activity

re-implement the geosearch

Browse Source
This commit is contained in:
Tamo 2021-10-22 18:03:39 +02:00
parent 7cd9109e2f
commit 3942b3732f
No known key found for this signature in database
GPG Key ID: 20CD8020AFA88D69
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,36 +253,7 @@ impl<'a> Filter<'a> {
rtxn, index, numbers_db, strings_db, field_id, &operator, rtxn, index, numbers_db, strings_db, field_id, &operator,
)?; )?;
return Ok((all_numbers_ids | all_strings_ids) - docids); return Ok((all_numbers_ids | all_strings_ids) - docids);
} /* }
Condition::GeoLowerThan(base_point, distance) => {
let rtree = match index.geo_rtree(rtxn)? {
Some(rtree) => rtree,
None => return Ok(RoaringBitmap::new()),
};
let result = rtree
.nearest_neighbor_iter(base_point)
.take_while(|point| {
distance_between_two_points(base_point, point.geom()) < *distance
})
.map(|point| point.data)
.collect();
return Ok(result);
}
Condition::GeoGreaterThan(point, distance) => {
let result = Self::evaluate_operator(
rtxn,
index,
numbers_db,
strings_db,
field_id,
&Condition::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 // Ask for the biggest value that can exist for this specific field, if it exists
@ -337,8 +308,34 @@ impl<'a> Filter<'a> {
Ok(lhs & rhs) Ok(lhs & rhs)
} }
FilterCondition::Empty => Ok(RoaringBitmap::new()), FilterCondition::Empty => Ok(RoaringBitmap::new()),
// TODO: TAMO FilterCondition::GeoLowerThan { point, radius } => {
_ => panic!("do the geosearch"), let base_point = [parse(&point[0])?, parse(&point[1])?];
let radius = parse(&radius)?;
let rtree = match index.geo_rtree(rtxn)? {
Some(rtree) => rtree,
None => return Ok(RoaringBitmap::new()),
};
let result = rtree
.nearest_neighbor_iter(&base_point)
.take_while(|point| {
distance_between_two_points(&base_point, point.geom()) < radius
})
.map(|point| point.data)
.collect();
return Ok(result);
}
FilterCondition::GeoGreaterThan { point, radius } => {
let result = Self::evaluate(
&FilterCondition::GeoLowerThan { point: point.clone(), radius: radius.clone() }
.into(),
rtxn,
index,
)?;
let geo_faceted_doc_ids = index.geo_faceted_documents_ids(rtxn)?;
return Ok(geo_faceted_doc_ids - result);
}
} }
} }
} }