diff --git a/src/database/pool.rs b/src/database/pool.rs index 3624ecb1..61b657ed 100644 --- a/src/database/pool.rs +++ b/src/database/pool.rs @@ -309,7 +309,7 @@ fn worker_loop(self: &Arc, recv: &Receiver) { self.busy.fetch_add(1, Ordering::Relaxed); while let Ok(cmd) = self.worker_wait(recv) { - self.worker_handle(cmd); + Pool::worker_handle(cmd); } } @@ -331,11 +331,11 @@ fn worker_wait(self: &Arc, recv: &Receiver) -> Result } #[implement(Pool)] -fn worker_handle(self: &Arc, cmd: Cmd) { +fn worker_handle(cmd: Cmd) { match cmd { - | Cmd::Get(cmd) if cmd.key.len() == 1 => self.handle_get(cmd), - | Cmd::Get(cmd) => self.handle_batch(cmd), - | Cmd::Iter(cmd) => self.handle_iter(cmd), + | Cmd::Get(cmd) if cmd.key.len() == 1 => Pool::handle_get(cmd), + | Cmd::Get(cmd) => Pool::handle_batch(cmd), + | Cmd::Iter(cmd) => Pool::handle_iter(cmd), } } @@ -346,7 +346,7 @@ fn worker_handle(self: &Arc, cmd: Cmd) { skip_all, fields(%cmd.map), )] -fn handle_iter(&self, mut cmd: Seek) { +fn handle_iter(mut cmd: Seek) { let chan = cmd.res.take().expect("missing result channel"); if chan.is_canceled() { @@ -375,8 +375,7 @@ fn handle_iter(&self, mut cmd: Seek) { keys = %cmd.key.len(), ), )] - -fn handle_batch(self: &Arc, mut cmd: Get) { +fn handle_batch(mut cmd: Get) { debug_assert!(cmd.key.len() > 1, "should have more than one key"); debug_assert!(!cmd.key.iter().any(SmallVec::is_empty), "querying for empty key"); @@ -402,7 +401,7 @@ fn handle_batch(self: &Arc, mut cmd: Get) { skip_all, fields(%cmd.map), )] -fn handle_get(&self, mut cmd: Get) { +fn handle_get(mut cmd: Get) { debug_assert!(!cmd.key[0].is_empty(), "querying for empty key"); // Obtain the result channel.