Skip to content

Buffer client CopyData messages #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 18, 2023
Merged

Buffer client CopyData messages #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/admin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ where
res.put_i32(5);
res.put_u8(b'I');

write_all_half(stream, res).await
write_all_half(stream, &res).await
}

/// Show PgCat version.
Expand All @@ -189,7 +189,7 @@ where
res.put_i32(5);
res.put_u8(b'I');

write_all_half(stream, res).await
write_all_half(stream, &res).await
}

/// Show utilization of connection pools for each shard and replicas.
Expand Down Expand Up @@ -250,7 +250,7 @@ where
res.put_i32(5);
res.put_u8(b'I');

write_all_half(stream, res).await
write_all_half(stream, &res).await
}

/// Show shards and replicas.
Expand Down Expand Up @@ -317,7 +317,7 @@ where
res.put_i32(5);
res.put_u8(b'I');

write_all_half(stream, res).await
write_all_half(stream, &res).await
}

/// Ignore any SET commands the client sends.
Expand Down Expand Up @@ -349,7 +349,7 @@ where
res.put_i32(5);
res.put_u8(b'I');

write_all_half(stream, res).await
write_all_half(stream, &res).await
}

/// Shows current configuration.
Expand Down Expand Up @@ -395,7 +395,7 @@ where
res.put_i32(5);
res.put_u8(b'I');

write_all_half(stream, res).await
write_all_half(stream, &res).await
}

/// Show shard and replicas statistics.
Expand Down Expand Up @@ -455,7 +455,7 @@ where
res.put_i32(5);
res.put_u8(b'I');

write_all_half(stream, res).await
write_all_half(stream, &res).await
}

/// Show currently connected clients
Expand Down Expand Up @@ -505,7 +505,7 @@ where
res.put_i32(5);
res.put_u8(b'I');

write_all_half(stream, res).await
write_all_half(stream, &res).await
}

/// Show currently connected servers
Expand Down Expand Up @@ -559,5 +559,5 @@ where
res.put_i32(5);
res.put_u8(b'I');

write_all_half(stream, res).await
write_all_half(stream, &res).await
}
46 changes: 28 additions & 18 deletions src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@ where
'Q' => {
debug!("Sending query to server");

self.send_and_receive_loop(code, message, server, &address, &pool)
self.send_and_receive_loop(code, Some(&message), server, &address, &pool)
.await?;

if !server.in_transaction() {
Expand Down Expand Up @@ -931,14 +931,8 @@ where
}
}

self.send_and_receive_loop(
code,
self.buffer.clone(),
server,
&address,
&pool,
)
.await?;
self.send_and_receive_loop(code, None, server, &address, &pool)
.await?;

self.buffer.clear();

Expand All @@ -955,21 +949,32 @@ where

// CopyData
'd' => {
// Forward the data to the server,
// don't buffer it since it can be rather large.
self.send_server_message(server, message, &address, &pool)
.await?;
self.buffer.put(&message[..]);

// Want to limit buffer size
if self.buffer.len() > 8196 {
// Forward the data to the server,
self.send_server_message(server, &self.buffer, &address, &pool)
.await?;
self.buffer.clear();
}
}

// CopyDone or CopyFail
// Copy is done, successfully or not.
'c' | 'f' => {
self.send_server_message(server, message, &address, &pool)
// We may already have some copy data in the buffer, add this message to buffer
self.buffer.put(&message[..]);

self.send_server_message(server, &self.buffer, &address, &pool)
.await?;

// Clear the buffer
self.buffer.clear();

let response = self.receive_server_message(server, &address, &pool).await?;

match write_all_half(&mut self.write, response).await {
match write_all_half(&mut self.write, &response).await {
Ok(_) => (),
Err(err) => {
server.mark_bad();
Expand Down Expand Up @@ -1016,13 +1021,18 @@ where
async fn send_and_receive_loop(
&mut self,
code: char,
message: BytesMut,
message: Option<&BytesMut>,
server: &mut Server,
address: &Address,
pool: &ConnectionPool,
) -> Result<(), Error> {
debug!("Sending {} to server", code);

let message = match message {
Some(message) => message,
None => &self.buffer,
};

self.send_server_message(server, message, address, pool)
.await?;

Expand All @@ -1032,7 +1042,7 @@ where
loop {
let response = self.receive_server_message(server, address, pool).await?;

match write_all_half(&mut self.write, response).await {
match write_all_half(&mut self.write, &response).await {
Ok(_) => (),
Err(err) => {
server.mark_bad();
Expand All @@ -1058,7 +1068,7 @@ where
async fn send_server_message(
&self,
server: &mut Server,
message: BytesMut,
message: &BytesMut,
address: &Address,
pool: &ConnectionPool,
) -> Result<(), Error> {
Expand Down
10 changes: 5 additions & 5 deletions src/messages.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ where
res.put_i32(len);
res.put_slice(&set_complete[..]);

write_all_half(stream, res).await?;
write_all_half(stream, &res).await?;
ready_for_query(stream).await
}

Expand Down Expand Up @@ -308,7 +308,7 @@ where
res.put_i32(error.len() as i32 + 4);
res.put(error);

write_all_half(stream, res).await
write_all_half(stream, &res).await
}

pub async fn wrong_password<S>(stream: &mut S, user: &str) -> Result<(), Error>
Expand Down Expand Up @@ -370,7 +370,7 @@ where
// CommandComplete
res.put(command_complete("SELECT 1"));

write_all_half(stream, res).await?;
write_all_half(stream, &res).await?;
ready_for_query(stream).await
}

Expand Down Expand Up @@ -459,11 +459,11 @@ where
}

/// Write all the data in the buffer to the TcpStream, write owned half (see mpsc).
pub async fn write_all_half<S>(stream: &mut S, buf: BytesMut) -> Result<(), Error>
pub async fn write_all_half<S>(stream: &mut S, buf: &BytesMut) -> Result<(), Error>
where
S: tokio::io::AsyncWrite + std::marker::Unpin,
{
match stream.write_all(&buf).await {
match stream.write_all(buf).await {
Ok(_) => Ok(()),
Err(_) => return Err(Error::SocketError(format!("Error writing to socket"))),
}
Expand Down
4 changes: 2 additions & 2 deletions src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ impl Server {
}

/// Send messages to the server from the client.
pub async fn send(&mut self, messages: BytesMut) -> Result<(), Error> {
pub async fn send(&mut self, messages: &BytesMut) -> Result<(), Error> {
self.stats.data_sent(messages.len(), self.server_id);

match write_all_half(&mut self.write, messages).await {
Expand Down Expand Up @@ -593,7 +593,7 @@ impl Server {
pub async fn query(&mut self, query: &str) -> Result<(), Error> {
let query = simple_query(query);

self.send(query).await?;
self.send(&query).await?;

loop {
let _ = self.recv().await?;
Expand Down