chore: minor simplification around WaitWatch #4580
Merged
Conversation
This file contains hidden or 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
Collaborator
romange
commented
Feb 7, 2025
romange
commented
- Rename FinalizeWatched to RemovedWatched.
- Simplify passing of WatchedKeys - instead of passing a callback we pass either a single value or signal that all the shard keys should be used. Less generic but more explicit.
romange
force-pushed
the
Pr4
branch
3 times, most recently
from
9804db9 to
f4b8a14
Compare
kostasrim
previously approved these changes
Feb 8, 2025
| // Provides keys to block on for specific shard. | ||
| using WaitKeysProvider = | ||
| std::function<std::variant<ShardArgs, ArgSlice>(Transaction*, EngineShard* shard)>; | ||
| static constexpr std::nullopt_t kShardArgs{std::nullopt}; |
There was a problem hiding this comment.
nullopt to denote the type passed via a variable. Not bad 🤓
| @@ -207,15 +207,14 @@ class Transaction { | |||
|
|
|||
| // Called by engine shard to execute a transaction hop. | |||
| // txq_ooo is set to true if the transaction is running out of order | |||
| // not as the tx queue head. | |||
| // Returns true if the transaction continues running in the thread | |||
| // not as the tx queue head. Returns true if the transaction concludes. | |||
There was a problem hiding this comment.
Had to check every RunInShard calls just to be sure the logic was inverted. Imo it's nicer now via the variable concludes 👍
1. Rename FinalizeWatched to RemovedWatched. 2. Simplify passing of WatchedKeys - instead of passing a callback we pass either a single value or signal that all the shard keys should be used. Less generic but more explicit. 3. Reverse the result from RunInShard() function - to improve readability. All in all it should not have any functional changes besides logging. Signed-off-by: Roman Gershman <roman@dragonflydb.io>
romange
requested review from
adiholden and
kostasrim
and removed request for
BorysTheDev
kostasrim
approved these changes
Feb 9, 2025
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.