Merge pull request #640 from MarinPostma/fix_filter_parenthesis

fixes parenthesis

CHANGELOG.md

@@ -1,5 +1,6 @@
 ## v0.10.1 (unreleased)
 
+  - Add support for floating points in filters (#640)
   - Add '@' character as tokenizer separator (#607)
   - Add support for filtering on arrays of strings (#611)
 

meilisearch-core/src/filters/mod.rs

@@ -60,6 +60,7 @@ impl<'a> Filter<'a> {
                 Rule::geq => Ok(Filter::Condition(Condition::geq(pair, schema)?)),
                 Rule::leq => Ok(Filter::Condition(Condition::leq(pair, schema)?)),
                 Rule::prgm => Self::build(pair.into_inner(), schema),
+                Rule::term => Self::build(pair.into_inner(), schema),
                 Rule::not => Ok(Filter::Not(Box::new(Self::build(
                     pair.into_inner(),
                     schema,
@@ -109,6 +110,7 @@ mod test {
         assert!(FilterParser::parse(Rule::prgm, r#"field > 10"#).is_ok());
         assert!(FilterParser::parse(Rule::prgm, r#"field < 10"#).is_ok());
         assert!(FilterParser::parse(Rule::prgm, r#"field < 10 AND NOT field=5"#).is_ok());
+        assert!(FilterParser::parse(Rule::prgm, r#"field < 10 AND NOT field > 7.5"#).is_ok());
         assert!(FilterParser::parse(Rule::prgm, r#"field=true OR NOT field=5"#).is_ok());
         assert!(FilterParser::parse(Rule::prgm, r#"NOT field=true OR NOT field=5"#).is_ok());
         assert!(FilterParser::parse(Rule::prgm, r#"field='hello world' OR ( NOT field=true OR NOT field=5 )"#).is_ok());

meilisearch-core/src/filters/parser/grammar.pest

@@ -2,7 +2,7 @@ key = _{quoted | word}
 value = _{quoted | word}
 quoted = _{ (PUSH("'") | PUSH("\"")) ~ string ~ POP  }
 string = {char*}
-word = ${(LETTER | NUMBER | "_" | "-")+}
+word = ${(LETTER | NUMBER | "_" | "-" | ".")+}
 
 char =  _{ !(PEEK | "\\") ~ ANY
     | "\\" ~ (PEEK | "\\" | "/" | "b" | "f" | "n" | "r" | "t")
@@ -18,7 +18,7 @@ less = {key ~ "<" ~ value}
 
 prgm = {SOI ~ expr ~ EOI}
 expr = _{ ( term ~ (operation ~ term)* ) }
-term = _{ ("(" ~ expr ~ ")") | condition | not }
+term = { ("(" ~ expr ~ ")") | condition | not }
 operation = _{ and | or }
 	and = {"AND"}
 	or = {"OR"}

meilisearch-http/tests/search.rs

@@ -492,12 +492,11 @@ fn search_with_attributes_to_retrieve_wildcard() {
 
 // Search with filter
 // q: Captain
-// limit: 1
+// limit: 3
 // filters: director:Anthony%20Russo
 #[test]
 fn search_with_filter() {
     let query = "q=captain&filters=director%20%3D%20%22Anthony%20Russo%22&limit=3";
-
     let expected = json!([
       {
         "id": 271110,
@@ -551,7 +550,191 @@ fn search_with_filter() {
         "vote_count": 10497
       }
     ]);
+    let (response, _status_code) = GLOBAL_SERVER.lock().unwrap().search(query);
+    assert_json_eq!(expected, response["hits"].clone(), ordered: false);
 
+    let expected = json!([
+        {
+            "id":2770,
+            "popularity":17.02,
+            "vote_average":6.1,
+            "title":"American Pie 2",
+            "tagline":"This Summer It's All About Sticking Together.",
+            "overview":"The whole gang are back and as close as ever. They decide to get even closer by spending the summer together at a beach house. They decide to hold the biggest party ever to be seen, even if the preparation doesn't always go to plan. Especially when Stifler, Finch and Jim become more close to each other than they ever want to be and when Jim mistakes super glue for lubricant...",
+            "director":"J.B. Rogers",
+            "producer":"Chris Moore",
+            "genres":[
+                "Comedy",
+                "Romance"
+            ],
+            "poster_path":"https://image.tmdb.org/t/p/w500/q4LNgUnRfltxzp3gf1MAGiK5LhV.jpg",
+            "vote_count":2888
+        }
+    ]);
+
+    // filters: title = "american pie 2"
+    let query = "q=american&filters=title%20%3D%20%22american%20pie%202%22";
+    let (response, _status_code) = GLOBAL_SERVER.lock().unwrap().search(query);
+    assert_json_eq!(expected, response["hits"].clone(), ordered: false);
+
+    let expected = json!([
+      {
+        "id": 271110,
+        "popularity": 37.431,
+        "vote_average": 7.4,
+        "title": "Captain America: Civil War",
+        "tagline": "Divided We Fall",
+        "overview": "Following the events of Age of Ultron, the collective governments of the world pass an act designed to regulate all superhuman activity. This polarizes opinion amongst the Avengers, causing two factions to side with Iron Man or Captain America, which causes an epic battle between former allies.",
+        "director": "Anthony Russo",
+        "producer": "Kevin Feige",
+        "genres": [
+          "Adventure",
+          "Action",
+          "Science Fiction"
+        ],
+        "poster_path": "https://image.tmdb.org/t/p/w500/kSBXou5Ac7vEqKd97wotJumyJvU.jpg",
+        "vote_count": 15079
+      },
+      {
+        "id": 100402,
+        "popularity": 16.418,
+        "vote_average": 7.7,
+        "title": "Captain America: The Winter Soldier",
+        "tagline": "In heroes we trust.",
+        "overview": "After the cataclysmic events in New York with The Avengers, Steve Rogers, aka Captain America is living quietly in Washington, D.C. and trying to adjust to the modern world. But when a S.H.I.E.L.D. colleague comes under attack, Steve becomes embroiled in a web of intrigue that threatens to put the world at risk. Joining forces with the Black Widow, Captain America struggles to expose the ever-widening conspiracy while fighting off professional assassins sent to silence him at every turn. When the full scope of the villainous plot is revealed, Captain America and the Black Widow enlist the help of a new ally, the Falcon. However, they soon find themselves up against an unexpected and formidable enemy—the Winter Soldier.",
+        "director": "Anthony Russo",
+        "producer": "Kevin Feige",
+        "genres": [
+          "Action",
+          "Adventure",
+          "Science Fiction"
+        ],
+        "poster_path": "https://image.tmdb.org/t/p/w500/5TQ6YDmymBpnF005OyoB7ohZps9.jpg",
+        "vote_count": 11972
+      }
+    ]);
+    // limit: 3, director = "anthony russo" AND  (title = "captain america: civil war" OR title = "Captain America: The Winter Soldier")
+    let query = "q=a&limit=3&filters=director%20%3D%20%22anthony%20russo%22%20AND%20%20(title%20%3D%20%22captain%20america%3A%20civil%20war%22%20OR%20title%20%3D%20%22Captain%20America%3A%20The%20Winter%20Soldier%22)";
+    let (response, _status_code) = GLOBAL_SERVER.lock().unwrap().search(query);
+    assert_json_eq!(expected, response["hits"].clone(), ordered: false);
+
+    let expected = json!([
+          {
+            "id": 299536,
+            "popularity": 65.013,
+            "vote_average": 8.3,
+            "title": "Avengers: Infinity War",
+            "tagline": "An entire universe. Once and for all.",
+            "overview": "As the Avengers and their allies have continued to protect the world from threats too large for any one hero to handle, a new danger has emerged from the cosmic shadows: Thanos. A despot of intergalactic infamy, his goal is to collect all six Infinity Stones, artifacts of unimaginable power, and use them to inflict his twisted will on all of reality. Everything the Avengers have fought for has led up to this moment - the fate of Earth and existence itself has never been more uncertain.",
+            "director": "Anthony Russo",
+            "producer": "Kevin Feige",
+            "genres": [
+              "Adventure",
+              "Action",
+              "Science Fiction"
+            ],
+            "poster_path": "https://image.tmdb.org/t/p/w500/7WsyChQLEftFiDOVTGkv3hFpyyt.jpg",
+            "vote_count": 16056
+          },
+          {
+            "id": 299534,
+            "popularity": 38.659,
+            "vote_average": 8.3,
+            "title": "Avengers: Endgame",
+            "tagline": "Part of the journey is the end.",
+            "overview": "After the devastating events of Avengers: Infinity War, the universe is in ruins due to the efforts of the Mad Titan, Thanos. With the help of remaining allies, the Avengers must assemble once more in order to undo Thanos' actions and restore order to the universe once and for all, no matter what consequences may be in store.",
+            "director": "Anthony Russo",
+            "producer": "Kevin Feige",
+            "genres": [
+              "Adventure",
+              "Science Fiction",
+              "Action"
+            ],
+            "poster_path": "https://image.tmdb.org/t/p/w500/or06FN3Dka5tukK1e9sl16pB3iy.jpg",
+            "vote_count": 10497
+          },
+          {
+            "id": 271110,
+            "popularity": 37.431,
+            "vote_average": 7.4,
+            "title": "Captain America: Civil War",
+            "tagline": "Divided We Fall",
+            "overview": "Following the events of Age of Ultron, the collective governments of the world pass an act designed to regulate all superhuman activity. This polarizes opinion amongst the Avengers, causing two factions to side with Iron Man or Captain America, which causes an epic battle between former allies.",
+            "director": "Anthony Russo",
+            "producer": "Kevin Feige",
+            "genres": [
+              "Adventure",
+              "Action",
+              "Science Fiction"
+            ],
+            "poster_path": "https://image.tmdb.org/t/p/w500/kSBXou5Ac7vEqKd97wotJumyJvU.jpg",
+            "vote_count": 15079
+          }
+        ]);
+    // director = "anthony russo" AND  (title = "captain america: civil war" OR vote_average > 8.0)
+    let query = "q=a&limit=3&filters=director%20%3D%20%22anthony%20russo%22%20AND%20%20(title%20%3D%20%22captain%20america%3A%20civil%20war%22%20OR%20vote_average%20%3E%208.0)";
+    let (response, _status_code) = GLOBAL_SERVER.lock().unwrap().search(query);
+    assert_json_eq!(expected, response["hits"].clone(), ordered: false);
+
+    let expected = json!([
+          {
+            "id": 812,
+            "popularity": 36.854,
+            "vote_average": 7.6,
+            "title": "Aladdin",
+            "tagline": "Wish granted!",
+            "overview": "Princess Jasmine grows tired of being forced to remain in the palace, so she sneaks out into the marketplace, in disguise, where she meets street-urchin Aladdin.  The couple falls in love, although Jasmine may only marry a prince.  After being thrown in jail, Aladdin becomes embroiled in a plot to find a mysterious lamp, with which the evil Jafar hopes to rule the land.",
+            "director": "Ron Clements",
+            "producer": "Ron Clements",
+            "genres": [
+              "Animation",
+              "Family",
+              "Adventure",
+              "Fantasy",
+              "Romance"
+            ],
+            "vote_count": 7156,
+            "poster_path": "https://image.tmdb.org/t/p/w500/mjKozYRuHc9j7SmiXmbVmCiAM0A.jpg"
+          },
+          {
+            "id": 348,
+            "popularity": 26.175,
+            "vote_average": 8.1,
+            "title": "Alien",
+            "tagline": "In space no one can hear you scream.",
+            "overview": "During its return to the earth, commercial spaceship Nostromo intercepts a distress signal from a distant planet. When a three-member team of the crew discovers a chamber containing thousands of eggs on the planet, a creature inside one of the eggs attacks an explorer. The entire crew is unaware of the impending nightmare set to descend upon them when the alien parasite planted inside its unfortunate host is birthed.",
+            "director": "Ridley Scott",
+            "producer": "David Giler",
+            "genres": [
+              "Horror",
+              "Science Fiction"
+            ],
+            "vote_count": 8237,
+            "poster_path": "https://image.tmdb.org/t/p/w500/2h00HrZs89SL3tXB4nbkiM7BKHs.jpg"
+          },
+          {
+            "id": 73,
+            "popularity": 22.887,
+            "vote_average": 8.4,
+            "title": "American History X",
+            "tagline": "Some Legacies Must End.",
+            "overview": "Derek Vineyard is paroled after serving 3 years in prison for killing two thugs who tried to break into/steal his truck. Through his brother, Danny Vineyard's narration, we learn that before going to prison, Derek was a skinhead and the leader of a violent white supremacist gang that committed acts of racial crime throughout L.A. and his actions greatly influenced Danny. Reformed and fresh out of prison, Derek severs contact with the gang and becomes determined to keep Danny from going down the same violent path as he did.",
+            "director": "Tony Kaye",
+            "producer": "John Morrissey",
+            "genres": [
+              "Drama"
+            ],
+            "vote_count": 6570,
+            "poster_path": "https://image.tmdb.org/t/p/w500/fXepRAYOx1qC3wju7XdDGx60775.jpg"
+          }
+        ]);
+        // NOT director = "anthony russo" AND vote_average > 7.5
+    let query = "q=a&limit=3&filters=NOT%20director%20%3D%20%22anthony%20russo%22%20AND%20vote_average%20%3E%207.5";
+    let (response, _status_code) = GLOBAL_SERVER.lock().unwrap().search(query);
+    assert_json_eq!(expected, response["hits"].clone(), ordered: false);
+
+    let expected = json!([]);
+    let query = "q=a&filters=NOT%20director%20%3D%20%22anthony%20russo%22%20AND%20title%20%20%3D%20%22Avengers%3A%20Endgame%22";
     let (response, _status_code) = GLOBAL_SERVER.lock().unwrap().search(query);
     assert_json_eq!(expected, response["hits"].clone(), ordered: false);
 }