From 30eb0e5b5baad02475a73c5ae16f3a1713bd21a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Mon, 2 Dec 2024 10:08:01 +0100 Subject: [PATCH] Rename recv and read methods to recv_action and recv_frame --- crates/milli/src/update/new/channel.rs | 4 ++-- crates/milli/src/update/new/indexer/mod.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/milli/src/update/new/channel.rs b/crates/milli/src/update/new/channel.rs index 7375354aa..82e483d18 100644 --- a/crates/milli/src/update/new/channel.rs +++ b/crates/milli/src/update/new/channel.rs @@ -136,11 +136,11 @@ impl LargeVectors { } impl<'a> WriterBbqueueReceiver<'a> { - pub fn recv(&mut self) -> Option { + pub fn recv_action(&mut self) -> Option { self.receiver.recv().ok() } - pub fn read(&mut self) -> Option> { + pub fn recv_frame(&mut self) -> Option> { for consumer in &mut self.consumers { if let Some(frame) = consumer.read() { return Some(FrameWithHeader::from(frame)); diff --git a/crates/milli/src/update/new/indexer/mod.rs b/crates/milli/src/update/new/indexer/mod.rs index e0450ff7d..bd3fedae2 100644 --- a/crates/milli/src/update/new/indexer/mod.rs +++ b/crates/milli/src/update/new/indexer/mod.rs @@ -417,7 +417,7 @@ where let span = tracing::trace_span!(target: "indexing::write_db", "post_merge"); let mut _entered_post_merge = None; - while let Some(action) = writer_receiver.recv() { + while let Some(action) = writer_receiver.recv_action() { if _entered_post_merge.is_none() && finished_extraction.load(std::sync::atomic::Ordering::Relaxed) { @@ -556,7 +556,7 @@ fn write_from_bbqueue( arroy_writers: &HashMap, aligned_embedding: &mut Vec, ) -> crate::Result<()> { - while let Some(frame_with_header) = writer_receiver.read() { + while let Some(frame_with_header) = writer_receiver.recv_frame() { match frame_with_header.header() { EntryHeader::DbOperation(operation) => { let database_name = operation.database.database_name();