From 55adbac2dddc3b706ffbff4b9b99596abc61f844 Mon Sep 17 00:00:00 2001 From: Tamo Date: Tue, 15 Apr 2025 14:43:07 +0200 Subject: [PATCH] Apply suggestions from code review --- crates/milli/src/search/new/geo_sort.rs | 9 ++++----- crates/milli/src/search/new/mod.rs | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/crates/milli/src/search/new/geo_sort.rs b/crates/milli/src/search/new/geo_sort.rs index 7f1c0feff..663599553 100644 --- a/crates/milli/src/search/new/geo_sort.rs +++ b/crates/milli/src/search/new/geo_sort.rs @@ -40,7 +40,6 @@ fn facet_number_values<'a>( } #[derive(Debug, Clone, Copy)] - pub struct Parameter { // Define the strategy used by the geo sort pub strategy: Strategy, @@ -107,7 +106,7 @@ pub struct GeoSort { impl GeoSort { pub fn new( - parameter: &Parameter, + parameter: Parameter, geo_faceted_docids: RoaringBitmap, point: [f64; 2], ascending: bool, @@ -115,15 +114,15 @@ impl GeoSort { let Parameter { strategy, max_bucket_size, distance_error_margin } = parameter; Ok(Self { query: None, - strategy: *strategy, + strategy, ascending, point, geo_candidates: geo_faceted_docids, field_ids: None, rtree: None, cached_sorted_docids: VecDeque::new(), - max_bucket_size: *max_bucket_size, - distance_error_margin: *distance_error_margin, + max_bucket_size, + distance_error_margin, }) } diff --git a/crates/milli/src/search/new/mod.rs b/crates/milli/src/search/new/mod.rs index 5042fb3b7..8b04d8c6a 100644 --- a/crates/milli/src/search/new/mod.rs +++ b/crates/milli/src/search/new/mod.rs @@ -300,7 +300,7 @@ fn get_ranking_rules_for_placeholder_search<'ctx>( &mut ranking_rules, &mut sorted_fields, &mut geo_sorted, - &geo_param, + geo_param, )?; sort = true; } @@ -376,7 +376,7 @@ fn get_ranking_rules_for_vector<'ctx>( &mut ranking_rules, &mut sorted_fields, &mut geo_sorted, - &geo_param, + geo_param, )?; sort = true; } @@ -478,7 +478,7 @@ fn get_ranking_rules_for_query_graph_search<'ctx>( &mut ranking_rules, &mut sorted_fields, &mut geo_sorted, - &geo_param, + geo_param, )?; sort = true; } @@ -515,7 +515,7 @@ fn resolve_sort_criteria<'ctx, Query: RankingRuleQueryTrait>( ranking_rules: &mut Vec>, sorted_fields: &mut HashSet, geo_sorted: &mut bool, - geo_param: &geo_sort::Parameter, + geo_param: geo_sort::Parameter, ) -> Result<()> { let sort_criteria = sort_criteria.clone().unwrap_or_default(); ranking_rules.reserve(sort_criteria.len());