rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-07 13:32:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

proxy: clean up code and lints for 1.81 and 1.82 (#8945)

Browse Source
This commit is contained in:
Folke Behrens
2024-09-06 17:13:30 +02:00
committed by GitHub
parent e287f36a05
commit af6f63617e
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
proxy/src/serverless/sql_over_http.rs
View File

@@ -745,22 +745,20 @@ impl BatchQueryData {
builder = builder.deferrable(true);
}
let transaction = builder.start().await.map_err(|e| {
let transaction = builder.start().await.inspect_err(|_| {
// if we cannot start a transaction, we should return immediately
// and not return to the pool. connection is clearly broken
discard.discard();
e
})?;
let json_output =
match query_batch(cancel.child_token(), &transaction, self, parsed_headers).await {
Ok(json_output) => {
info!("commit");
let status = transaction.commit().await.map_err(|e| {
let status = transaction.commit().await.inspect_err(|_| {
// if we cannot commit - for now don't return connection to pool
// TODO: get a query status from the error
discard.discard();
e
})?;
discard.check_idle(status);
json_output
@@ -776,11 +774,10 @@ impl BatchQueryData {
}
Err(err) => {
info!("rollback");
let status = transaction.rollback().await.map_err(|e| {
let status = transaction.rollback().await.inspect_err(|_| {
// if we cannot rollback - for now don't return connection to pool
// TODO: get a query status from the error
discard.discard();
e
})?;
discard.check_idle(status);
return Err(err);