From bbb6728d2f017f2a6eea34c15fd6a7c8155d77c1 Mon Sep 17 00:00:00 2001 From: ad hoc Date: Fri, 8 Apr 2022 17:32:22 +0200 Subject: [PATCH 1/3] add distinct attributes to cli --- cli/src/main.rs | 10 ++++++++++ milli/src/search/mod.rs | 2 ++ 2 files changed, 12 insertions(+) diff --git a/cli/src/main.rs b/cli/src/main.rs index 3e9e8c75f..97580142b 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -469,6 +469,8 @@ struct SettingsUpdate { criteria: Option>, #[structopt(long)] exact_attributes: Option>, + #[structopt(long)] + distinct_attribute: Option, } impl Performer for SettingsUpdate { @@ -503,6 +505,14 @@ impl Performer for SettingsUpdate { } } + if let Some(distinct_attr) = self.distinct_attribute { + if !distinct_attr.is_empty() { + update.set_distinct_field(distinct_attr); + } else { + update.reset_distinct_field(); + } + } + let mut bars = Vec::new(); let progesses = MultiProgress::new(); for _ in 0..4 { diff --git a/milli/src/search/mod.rs b/milli/src/search/mod.rs index b01bae817..d53bcafb7 100644 --- a/milli/src/search/mod.rs +++ b/milli/src/search/mod.rs @@ -243,6 +243,8 @@ impl<'a> Search<'a> { excluded_candidates = candidates.into_excluded(); } + dbg!(excluded_candidates.len()); + Ok(SearchResult { matching_words, candidates: initial_candidates, documents_ids }) } } From cd83014fff5b8cf7300be62e1fd470d6f4af87be Mon Sep 17 00:00:00 2001 From: ad hoc Date: Sat, 9 Apr 2022 14:50:43 +0200 Subject: [PATCH 2/3] add test for disctinct nb hits --- milli/tests/search/distinct.rs | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/milli/tests/search/distinct.rs b/milli/tests/search/distinct.rs index 631618f73..022724fde 100644 --- a/milli/tests/search/distinct.rs +++ b/milli/tests/search/distinct.rs @@ -8,7 +8,7 @@ use Criterion::*; use crate::search::{self, EXTERNAL_DOCUMENTS_IDS}; macro_rules! test_distinct { - ($func:ident, $distinct:ident, $criteria:expr) => { + ($func:ident, $distinct:ident, $criteria:expr, $n_res:expr) => { #[test] fn $func() { let criteria = $criteria; @@ -30,7 +30,9 @@ macro_rules! test_distinct { search.authorize_typos(true); search.optional_words(true); - let SearchResult { documents_ids, .. } = search.execute().unwrap(); + let SearchResult { documents_ids, candidates, .. } = search.execute().unwrap(); + + assert_eq!(candidates.len(), $n_res); let mut distinct_values = HashSet::new(); let expected_external_ids: Vec<_> = search::expected_order(&criteria, true, true, &[]) @@ -54,20 +56,22 @@ macro_rules! test_distinct { test_distinct!( distinct_string_default_criteria, tag, - vec![Words, Typo, Proximity, Attribute, Exactness] + vec![Words, Typo, Proximity, Attribute, Exactness], + 3 ); test_distinct!( distinct_number_default_criteria, asc_desc_rank, - vec![Words, Typo, Proximity, Attribute, Exactness] + vec![Words, Typo, Proximity, Attribute, Exactness], + 7 ); -test_distinct!(distinct_string_criterion_words, tag, vec![Words]); -test_distinct!(distinct_number_criterion_words, asc_desc_rank, vec![Words]); -test_distinct!(distinct_string_criterion_words_typo, tag, vec![Words, Typo]); -test_distinct!(distinct_number_criterion_words_typo, asc_desc_rank, vec![Words, Typo]); -test_distinct!(distinct_string_criterion_words_proximity, tag, vec![Words, Proximity]); -test_distinct!(distinct_number_criterion_words_proximity, asc_desc_rank, vec![Words, Proximity]); -test_distinct!(distinct_string_criterion_words_attribute, tag, vec![Words, Attribute]); -test_distinct!(distinct_number_criterion_words_attribute, asc_desc_rank, vec![Words, Attribute]); -test_distinct!(distinct_string_criterion_words_exactness, tag, vec![Words, Exactness]); -test_distinct!(distinct_number_criterion_words_exactness, asc_desc_rank, vec![Words, Exactness]); +test_distinct!(distinct_string_criterion_words, tag, vec![Words], 3); +test_distinct!(distinct_number_criterion_words, asc_desc_rank, vec![Words], 7); +test_distinct!(distinct_string_criterion_words_typo, tag, vec![Words, Typo], 3); +test_distinct!(distinct_number_criterion_words_typo, asc_desc_rank, vec![Words, Typo], 7); +test_distinct!(distinct_string_criterion_words_proximity, tag, vec![Words, Proximity], 3); +test_distinct!(distinct_number_criterion_words_proximity, asc_desc_rank, vec![Words, Proximity], 7); +test_distinct!(distinct_string_criterion_words_attribute, tag, vec![Words, Attribute], 3); +test_distinct!(distinct_number_criterion_words_attribute, asc_desc_rank, vec![Words, Attribute], 7); +test_distinct!(distinct_string_criterion_words_exactness, tag, vec![Words, Exactness], 3); +test_distinct!(distinct_number_criterion_words_exactness, asc_desc_rank, vec![Words, Exactness], 7); From dda28d74156bc45e2895d9226ea00c64210edb10 Mon Sep 17 00:00:00 2001 From: ad hoc Date: Sat, 9 Apr 2022 14:30:00 +0200 Subject: [PATCH 3/3] exclude excluded canditates from search result candidates --- milli/src/search/mod.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/milli/src/search/mod.rs b/milli/src/search/mod.rs index d53bcafb7..dcb2e0803 100644 --- a/milli/src/search/mod.rs +++ b/milli/src/search/mod.rs @@ -243,9 +243,11 @@ impl<'a> Search<'a> { excluded_candidates = candidates.into_excluded(); } - dbg!(excluded_candidates.len()); - - Ok(SearchResult { matching_words, candidates: initial_candidates, documents_ids }) + Ok(SearchResult { + matching_words, + candidates: initial_candidates - excluded_candidates, + documents_ids, + }) } }