From f6803dd7d100b9d419747c69fc03f2207a64dfa9 Mon Sep 17 00:00:00 2001
From: Mubelotix <simon@meilisearch.com>
Date: Mon, 30 Jun 2025 14:05:23 +0200
Subject: [PATCH] Simplify iterator chaining in facet sort

---
 .../milli/src/facet/facet_sort_recursive.rs   | 43 ++++++-------------
 1 file changed, 14 insertions(+), 29 deletions(-)

diff --git a/crates/milli/src/facet/facet_sort_recursive.rs b/crates/milli/src/facet/facet_sort_recursive.rs
index 87da20391..6f26ad16f 100644
--- a/crates/milli/src/facet/facet_sort_recursive.rs
+++ b/crates/milli/src/facet/facet_sort_recursive.rs
@@ -88,39 +88,24 @@ impl<'ctx> SortedDocumentsIteratorBuilder<'ctx> {
         };
 
         // Create builders for the next level of the tree
-        let number_db2 = number_db;
-        let string_db2 = string_db;
-        let number_iter =
-            number_iter.map(move |r| -> crate::Result<SortedDocumentsIteratorBuilder> {
-                let (docids, _bytes) = r?;
-                Ok(SortedDocumentsIteratorBuilder {
-                    index,
-                    rtxn,
-                    number_db,
-                    string_db,
-                    fields: &fields[1..],
-                    candidates: docids,
-                    geo_candidates,
-                })
-            });
-        let string_iter =
-            string_iter.map(move |r| -> crate::Result<SortedDocumentsIteratorBuilder> {
-                let (docids, _bytes) = r?;
-                Ok(SortedDocumentsIteratorBuilder {
-                    index,
-                    rtxn,
-                    number_db: number_db2,
-                    string_db: string_db2,
-                    fields: &fields[1..],
-                    candidates: docids,
-                    geo_candidates,
-                })
-            });
+        let number_iter = number_iter.map(|r| r.map(|(d, _)| d));
+        let string_iter = string_iter.map(|r| r.map(|(d, _)| d));
+        let next_children = number_iter.chain(string_iter).map(move |r| {
+            Ok(SortedDocumentsIteratorBuilder {
+                index,
+                rtxn,
+                number_db,
+                string_db,
+                fields: &fields[1..],
+                candidates: r?,
+                geo_candidates,
+            })
+        });
 
         Ok(SortedDocumentsIterator::Branch {
             current_child: None,
             next_children_size: size,
-            next_children: Box::new(number_iter.chain(string_iter)),
+            next_children: Box::new(next_children),
         })
     }