From 79a1212ebea46403389cfc4b0e632a919f5161a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9mentine=20Urquizar?= <clementine@meilisearch.com>
Date: Tue, 15 Jun 2021 17:28:26 +0200
Subject: [PATCH] Do intersection with displayed ids instead of checking in
 loop

---
 meilisearch-http/src/index/search.rs | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/meilisearch-http/src/index/search.rs b/meilisearch-http/src/index/search.rs
index e4c7777a0..c1275d089 100644
--- a/meilisearch-http/src/index/search.rs
+++ b/meilisearch-http/src/index/search.rs
@@ -162,6 +162,9 @@ impl Index {
             .keys()
             .cloned()
             .collect::<HashSet<_>>()
+            .intersection(&displayed_ids)
+            .cloned()
+            .collect::<HashSet<_>>()
             .union(&to_retrieve_ids)
             .cloned()
             .sorted()
@@ -240,9 +243,7 @@ fn parse_formatted_options(
         }
 
         if let Some(id) = fields_ids_map.id(&attr) {
-            if displayed_ids.contains(&id) {
-                formatted_options.insert(id, new_format);
-            }
+            formatted_options.insert(id, new_format);
         }
     };
 
@@ -274,16 +275,14 @@ fn parse_formatted_options(
         }
 
         if let Some(id) = fields_ids_map.id(&attr_name) {
-            if displayed_ids.contains(&id) {
-                let mut highlight = false;
-                if let Some(f) = formatted_options.get(&id) {
-                    highlight = f.highlight;
-                }
-                formatted_options.insert(id, FormatOptions {
-                    highlight,
-                    crop: attr_len,
-                });
+            let mut highlight = false;
+            if let Some(f) = formatted_options.get(&id) {
+                highlight = f.highlight;
             }
+            formatted_options.insert(id, FormatOptions {
+                highlight,
+                crop: attr_len,
+            });
         }
     }