searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-01-10 21:44:34 +01:00
Code Issues Releases Wiki Activity

Redo to_retrieve_ids

Browse Source
This commit is contained in:
Clémentine Urquizar 2021-06-15 16:21:41 +02:00
parent 5dffe566fd
commit d9c0190497
No known key found for this signature in database
GPG Key ID: D8E7CC7422E77E1A
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
meilisearch-http/src/index/search.rs
View File

@ -113,31 +113,37 @@ impl Index {
} }
if let Some(id) = fields_ids_map.id(attr) { if let Some(id) = fields_ids_map.id(attr) {
if displayed_ids.contains(&id) { ids.insert(id);
ids.insert(id);
}
} }
} }
ids ids
}; };
let to_retrieve_ids = query // The attributes to retrieve are the ones explicitly marked as to retrieve (all by default),
// but these attributes must be also
// - present in the fields_ids_map
// - present in the the displayed attributes
let to_retrieve_ids: HashSet<_> = query
.attributes_to_retrieve .attributes_to_retrieve
.as_ref() .as_ref()
.map(fids) .map(fids)
.unwrap_or_else(|| displayed_ids.clone()); .unwrap_or_else(|| displayed_ids.clone())
// The attributes to retrieve are:
// - the ones explicitly marked as to retrieve that are also in the displayed attributes
let all_attributes: Vec<_> = to_retrieve_ids
.intersection(&displayed_ids) .intersection(&displayed_ids)
.cloned() .cloned()
.collect();
let to_retrieve_ids_sorted: Vec<_> = to_retrieve_ids
.clone()
.into_iter()
.sorted() .sorted()
.collect(); .collect();
let mut formatted_options = HashMap::new(); let mut formatted_options = HashMap::new();
let attr_to_highlight = query.attributes_to_highlight.unwrap_or_default(); let attr_to_highlight = query
.attributes_to_highlight
.unwrap_or_default();
for attr in attr_to_highlight { for attr in attr_to_highlight {
let new_format = FormatOptions { let new_format = FormatOptions {
highlight: true, highlight: true,
@ -159,7 +165,10 @@ impl Index {
} }
}; };
let attr_to_crop = query.attributes_to_crop.unwrap_or_default(); let attr_to_crop = query
.attributes_to_crop
.unwrap_or_default();
for attr in attr_to_crop { for attr in attr_to_crop {
let mut attr_name = attr.clone(); let mut attr_name = attr.clone();
let mut attr_len = Some(query.crop_length); let mut attr_len = Some(query.crop_length);
@ -201,13 +210,13 @@ impl Index {
} }
} }
let formatted_ids = formatted_options // All attributes present in `_formatted`:
// - attributes asked to be highlighted or cropped (with `attributesToCrop` or `attributesToHighlight`)
// - attributes asked to be retrieved: these attributes will not be formatted
let ids_in_formatted = formatted_options
.keys() .keys()
.cloned() .cloned()
.collect::<HashSet<_>>(); .collect::<HashSet<_>>()
// All attributes present in `_formatted` that are not necessary highighted or cropped
let ids_in_formatted = formatted_ids
.union(&to_retrieve_ids) .union(&to_retrieve_ids)
.cloned() .cloned()
.sorted() .sorted()
@ -218,7 +227,7 @@ impl Index {
Formatter::new(&stop_words, (String::from("<em>"), String::from("</em>"))); Formatter::new(&stop_words, (String::from("<em>"), String::from("</em>")));
for (_id, obkv) in self.documents(&rtxn, documents_ids)? { for (_id, obkv) in self.documents(&rtxn, documents_ids)? {
let document = make_document(&all_attributes, &fields_ids_map, obkv)?; let document = make_document(&to_retrieve_ids_sorted, &fields_ids_map, obkv)?;
let formatted = compute_formatted( let formatted = compute_formatted(
&fields_ids_map, &fields_ids_map,
obkv, obkv,
@ -498,8 +507,6 @@ fn parse_facets_array(
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use std::iter::FromIterator;
use super::*; use super::*;
#[test] #[test]