...

src/server.rs

@@ -16,6 +16,7 @@ pub struct Server {
     pub option: options::DBOption,
     pub client_name: Option<String>,
     pub selected_db: u64, // Changed from usize to u64
+    pub queued_cmd: Option<Vec<(Cmd, Protocol)>>,
 }
 
 impl Server {
@@ -25,6 +26,7 @@ impl Server {
             option,
             client_name: None,
             selected_db: 0,
+            queued_cmd: None,
         }
     }
 
@@ -61,7 +63,6 @@ impl Server {
         mut stream: tokio::net::TcpStream,
     ) -> Result<(), DBError> {
         let mut buf = [0; 512];
-        let mut queued_cmd: Option<Vec<(Cmd, Protocol)>> = None;
         
         loop {
             let len = match stream.read(&mut buf).await {
@@ -96,16 +97,13 @@ impl Server {
                 // Check if this is a QUIT command before processing
                 let is_quit = matches!(cmd, Cmd::Quit);
 
-                let res = cmd
-                    .run(&mut self.clone(), protocol.clone(), &mut queued_cmd)
-                    .await
-                    .unwrap_or(Protocol::err("unknown cmd from server"));
+                let res = cmd.run(self).await.unwrap_or(Protocol::err("unknown cmd from server"));
                 
                 if self.option.debug {
-                    println!("\x1b[34;1mqueued cmd {:?}\x1b[0m", queued_cmd);
+                    println!("\x1b[34;1mqueued cmd {:?}\x1b[0m", self.queued_cmd);
                     println!("\x1b[32;1mgoing to send response {}\x1b[0m", res.encode());
                 } else {
-                    print!("queued cmd {:?}", queued_cmd);
+                    print!("queued cmd {:?}", self.queued_cmd);
                     println!("going to send response {}", res.encode());
                 }