fix: use logical OR instead of bitwise OR in conflict resolver#6492
Merged
Xuanwo merged 1 commit intolance-format:mainfrom Apr 13, 2026
Merged
fix: use logical OR instead of bitwise OR in conflict resolver#6492Xuanwo merged 1 commit intolance-format:mainfrom
Xuanwo merged 1 commit intolance-format:mainfrom
Conversation
Contributor
|
ACTION NEEDED The PR title and description are used as the merge commit message. Please update your PR title and description to match the specification. For details on the error please inspect the "PR Title Check" action. |
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
Xuanwo
approved these changes
Apr 13, 2026
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
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.
Summary
Replace bitwise OR (
|) with logical OR (||) incheck_update_config_txnto enable short-circuit evaluation when checking for conflicting UpdateConfig transactions.Context
In
conflict_resolver.rs, the condition checking whether twoUpdateConfigtransactions conflict uses|(bitwise OR) instead of||(logical OR). While both produce the same boolean result,|always evaluates both operands.Using
||short-circuits on the firsttrue, skipping the unnecessary call tomodifies_same_metadatawhenupsert_key_conflictalready determined a conflict.Test plan
cargo test -p lance)