Skip to content
Merged
Changes from all commits
Commits
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
16 changes: 6 additions & 10 deletions pgdog/src/frontend/client/query_engine/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,10 @@ impl QueryEngine {
}
}

match safe_timeout(
context.timeouts.query_timeout(&State::Active),
Box::pin(self.client_server_exchange(context)),
)
.await
{
let query_timeout = context.timeouts.query_timeout(&State::Active);
let result = safe_timeout(query_timeout, self.client_server_exchange(context)).await;

match result {
Ok(response) => response?,
Err(err) => {
// Close the conn, it could be stuck executing a query
Expand All @@ -82,8 +80,7 @@ impl QueryEngine {
) -> Result<(), Error> {
match context.rewrite_result.take() {
Some(RewriteResult::InsertSplit(requests)) => {
multi_step::InsertMulti::from_engine(self, requests)
.execute(context)
Box::pin(multi_step::InsertMulti::from_engine(self, requests).execute(context))
.await?;
}

Expand All @@ -102,8 +99,7 @@ impl QueryEngine {
}

Some(RewriteResult::ShardingKeyUpdate(sharding_key_update)) => {
multi_step::UpdateMulti::new(self, &sharding_key_update)
.execute(context)
Box::pin(multi_step::UpdateMulti::new(self, &sharding_key_update).execute(context))
.await?;
}
}
Expand Down
Loading