Skip to content

consult, prioritize event.request_id over database_update.request_id (#2729) #3368

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

consult, prioritize event.request_id over database_update.request_id (#2729) #3368

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
3 changes: 2 additions & 1 deletion crates/core/src/client/messages.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,8 @@ impl ToProtocol for TransactionUpdateMessage {
let TransactionUpdateMessage { event, database_update } = self;
let update = database_update.database_update;
protocol.assert_matches_format_switch(&update);
let request_id = database_update.request_id.unwrap_or(0);
let mut request_id = database_update.request_id.unwrap_or(0);
request_id = event.clone().map_or(request_id, |e| e.request_id.unwrap_or(request_id));
Comment on lines +283 to +284
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let mut request_id = database_update.request_id.unwrap_or(0);
request_id = event.clone().map_or(request_id, |e| e.request_id.unwrap_or(request_id));
let request_id = database_update.request_id
.or_else(|| event.as_ref().map(|event| event.request_id)
.unwrap_or(0);

No need to clone the event, and a functional style with Option combinators is better here than mutation.

match update {
FormatSwitch::Bsatn(update) => FormatSwitch::Bsatn(convert(event, request_id, update, |args| {
Vec::from(args.get_bsatn().clone()).into()
Expand Down
Loading