Skip to content

Exit postgres query_async task if rows consumer has been dropped #3525

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

Open
rylev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Exit postgres query_async task if rows consumer has been dropped #3525

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
55 changes: 33 additions & 22 deletions crates/factor-outbound-pg/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,31 +283,42 @@ impl Client for PooledTokioClient {

tokio::spawn(async move {
loop {
let Some(row) = rows.next().await else {
_ = err_tx.send(Ok(()));
return;
};
match row {
Ok(row) => {
let byte_count = row.iter().map(|v| v.memory_size()).sum::<usize>();
if byte_count > max_result_bytes {
_ = err_tx.send(Err(v4::Error::QueryFailed(v4::QueryError::Text(
format!("query result exceeds limit of {max_result_bytes} bytes"),
))));
return;
}

if let Err(e) = rows_tx.send(row).await {
_ = err_tx.send(Err(v4::Error::QueryFailed(v4::QueryError::Text(
format!("async error: {e}"),
))));
tokio::select! {
biased;
// Exit immediately if the consumer (rows_rx) has been dropped,
// preventing this task from leaking.
_ = rows_tx.closed() => {
_ = err_tx.send(Ok(()));
return;
}
row = rows.next() => {
let Some(row) = row else {
_ = err_tx.send(Ok(()));
return;
};
match row {
Ok(row) => {
let byte_count = row.iter().map(|v| v.memory_size()).sum::<usize>();
if byte_count > max_result_bytes {
_ = err_tx.send(Err(v4::Error::QueryFailed(v4::QueryError::Text(
format!("query result exceeds limit of {max_result_bytes} bytes"),
))));
return;
}

if let Err(e) = rows_tx.send(row).await {
_ = err_tx.send(Err(v4::Error::QueryFailed(v4::QueryError::Text(
format!("async error: {e}"),
))));
return;
}
}
Err(e) => {
_ = err_tx.send(Err(e));
return;
}
}
}
Err(e) => {
_ = err_tx.send(Err(e));
return;
}
}
}
});
Expand Down
Loading