snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-23 18:45:06 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

format

Browse Source
This commit is contained in:
刘瀚骋 2021-10-12 22:19:28 +08:00
parent d323e35001
commit 2c65781d91
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,3 @@
use std::fmt::Debug; use std::fmt::Debug;
use std::ops::Bound::{self, Excluded, Included}; use std::ops::Bound::{self, Excluded, Included};
@ -16,9 +15,7 @@ use crate::error::{Error, UserError};
use crate::heed_codec::facet::{ use crate::heed_codec::facet::{
FacetLevelValueF64Codec, FacetStringLevelZeroCodec, FacetStringLevelZeroValueCodec, FacetLevelValueF64Codec, FacetStringLevelZeroCodec, FacetStringLevelZeroValueCodec,
}; };
use crate::{ use crate::{distance_between_two_points, CboRoaringBitmapCodec, FieldId, Index, Result};
distance_between_two_points, CboRoaringBitmapCodec, FieldId, Index, Result,
};
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
pub enum FilterCondition { pub enum FilterCondition {

12
milli/src/search/facet/filter_parser.rs
View File

@ -215,8 +215,7 @@ impl<'a> ParseContext<'a> {
where where
E: ParseError<&'a str> + ContextError<&'a str> + Debug, E: ParseError<&'a str> + ContextError<&'a str> + Debug,
{ {
let err_msg_args_incomplete:&'static str = let err_msg_args_incomplete:&'static str = "_geoRadius. The `_geoRadius` filter expect three arguments: `_geoRadius(latitude, longitude, radius)`";
"_geoRadius. The `_geoRadius` filter expect three arguments: `_geoRadius(latitude, longitude, radius)`";
let err_msg_args_invalid: &'static str = let err_msg_args_invalid: &'static str =
"_geoRadius. Latitude and longitude must be contained between -180 to 180 degrees."; "_geoRadius. Latitude and longitude must be contained between -180 to 180 degrees.";
let (input, args): (&str, Vec<&str>) = match preceded( let (input, args): (&str, Vec<&str>) = match preceded(
@ -256,7 +255,7 @@ impl<'a> ParseContext<'a> {
.or((!(-181.0..181.).contains(&lng)).then(|| &lng)) .or((!(-181.0..181.).contains(&lng)).then(|| &lng))
{ {
let e = E::from_char(input, '('); let e = E::from_char(input, '(');
return Err(nom::Err::Failure(E::add_context(input,err_msg_args_invalid, e))); return Err(nom::Err::Failure(E::add_context(input, err_msg_args_invalid, e)));
} }
let res = FilterCondition::Operator(fid, GeoLowerThan([lat, lng], dis)); let res = FilterCondition::Operator(fid, GeoLowerThan([lat, lng], dis));
@ -270,7 +269,7 @@ impl<'a> ParseContext<'a> {
let l1 = |c| self.parse_simple_condition(c); let l1 = |c| self.parse_simple_condition(c);
let l2 = |c| self.parse_range_condition(c); let l2 = |c| self.parse_range_condition(c);
let l3 = |c| self.parse_geo_radius(c); let l3 = |c| self.parse_geo_radius(c);
let (input, condition) = alt((l1, l2,l3))(input)?; let (input, condition) = alt((l1, l2, l3))(input)?;
Ok((input, condition)) Ok((input, condition))
} }
@ -395,7 +394,7 @@ mod tests {
let mut wtxn = index.write_txn().unwrap(); let mut wtxn = index.write_txn().unwrap();
let mut builder = Settings::new(&mut wtxn, &index, 0); let mut builder = Settings::new(&mut wtxn, &index, 0);
builder.set_searchable_fields(vec![S("channel"), S("timestamp"),S("id")]); // to keep the fields order builder.set_searchable_fields(vec![S("channel"), S("timestamp"), S("id")]); // to keep the fields order
builder.set_filterable_fields(hashset! { S("channel"), S("timestamp") ,S("id")}); builder.set_filterable_fields(hashset! { S("channel"), S("timestamp") ,S("id")});
builder.execute(|_, _| ()).unwrap(); builder.execute(|_, _| ()).unwrap();
wtxn.commit().unwrap(); wtxn.commit().unwrap();
@ -530,7 +529,8 @@ mod tests {
&rtxn, &rtxn,
&index, &index,
"(NOT _geoRadius(1, 2, 300) AND _geoRadius(1.001, 2.002, 1000.300)) OR price <= 10", "(NOT _geoRadius(1, 2, 300) AND _geoRadius(1.001, 2.002, 1000.300)) OR price <= 10",
).unwrap(); )
.unwrap();
let expected = FilterCondition::Or( let expected = FilterCondition::Or(
Box::new(FilterCondition::And( Box::new(FilterCondition::And(
Box::new(FilterCondition::Operator(0, GeoGreaterThan([1., 2.], 300.))), Box::new(FilterCondition::Operator(0, GeoGreaterThan([1., 2.], 300.))),