Tiny refactoring during data race investigation #5299
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
agourlay
reviewed
Oct 23, 2024
| @@ -305,7 +305,7 @@ impl ShardOperation for ForwardProxyShard { | |||
| let tick = result.clock_tag.map(|tag| tag.clock_tick); | |||
| let remote_tick = remote_result.clock_tag.map(|tag| tag.clock_tick); | |||
|
|
|||
| if remote_tick > tick || tick.is_none() { | |||
There was a problem hiding this comment.
The simplified condition behaves slightly different on inputs:
remote_tick |
tick |
Before | After |
|---|---|---|---|
None |
None |
true | false |
Some |
None |
true | true |
None |
Some |
false | false |
Some(1) |
Some(2) |
false | false |
Some(2) |
Some(1) |
true | true |
Some(1) |
Some(1) |
false | false |
There's one discrepancy as you can see. However, in that case the clock tag itself will be exactly the same, and so the end result is exactly the same.
Even though it's fine, I'll revert my change because the previous version may be a bit easier to understand.
KShivendu
approved these changes
Oct 30, 2024
n0x29a
pushed a commit
that referenced
this pull request
Nov 4, 2024
* We can always try to remove without checking first * Remove redundant condition * Simplify log message * Revert simplification * Remove intermediate write guard
timvisee
added a commit
that referenced
this pull request
Nov 8, 2024
* We can always try to remove without checking first * Remove redundant condition * Simplify log message * Revert simplification * Remove intermediate write guard
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Tiny improvements I made on top of #5298.
To prevent cluttering the main PR - making the problem harder to understand - I moved them to a separate PR.
These changes are not significant and don't include any logic changes.
All Submissions:
devbranch. Did you create your branch fromdev?New Feature Submissions:
cargo +nightly fmt --allcommand prior to submission?cargo clippy --all --all-featurescommand?