Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update client side parameters when changed
  • Loading branch information
zainkabani committed Jun 16, 2023
commit b8f0b0d87da90ed1d71f333f11bdc71bda43b5db
2 changes: 1 addition & 1 deletion src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1452,7 +1452,7 @@ where
timeout => tokio::time::Duration::from_millis(timeout),
};

match tokio::time::timeout(statement_timeout_duration, server.recv()).await {
match tokio::time::timeout(statement_timeout_duration, server.recv(Some(&mut self.server_parameters))).await {
Ok(result) => match result {
Ok(message) => Ok(message),
Err(err) => {
Expand Down
2 changes: 1 addition & 1 deletion src/mirrors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ impl MirroredClient {
}

// Incoming data from server (we read to clear the socket buffer and discard the data)
recv_result = server.recv() => {
recv_result = server.recv(None) => {
match recv_result {
Ok(message) => trace!("Received from mirror: {} {:?}", String::from_utf8_lossy(&message[..]), address.clone()),
Err(err) => {
Expand Down
13 changes: 10 additions & 3 deletions src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,10 @@ impl Server {
/// Receive data from the server in response to a client request.
/// This method must be called multiple times while `self.is_data_available()` is true
/// in order to receive all data the server has to offer.
pub async fn recv(&mut self) -> Result<BytesMut, Error> {
pub async fn recv(
&mut self,
mut client_server_parameters: Option<&mut ServerParameters>,
) -> Result<BytesMut, Error> {
loop {
let mut message = match read_message(&mut self.stream).await {
Ok(message) => message,
Expand Down Expand Up @@ -974,6 +977,10 @@ impl Server {
let key = message.read_string().unwrap();
let value = message.read_string().unwrap();

if let Some(client_server_parameters) = client_server_parameters.as_mut() {
client_server_parameters.set_param(key.clone(), value.clone(), false);
}

self.server_parameters.set_param(key, value, false);
}

Expand Down Expand Up @@ -1117,7 +1124,7 @@ impl Server {
self.send(&query).await?;

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

if !self.data_available {
break;
Expand Down Expand Up @@ -1211,7 +1218,7 @@ impl Server {
.await?;
debug!("Connected!, sending query.");
server.send(&simple_query(query)).await?;
let mut message = server.recv().await?;
let mut message = server.recv(None).await?;

Ok(parse_query_message(&mut message).await?)
}
Expand Down