fix: use EpochWithGap::new_max_epoch if the provided epoch is max epoch #13881
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
xxhZs
approved these changes
Dec 8, 2023
src/storage/hummock_sdk/src/lib.rs
Outdated
| EpochWithGap::new_max_epoch() | ||
| } else { | ||
| debug_assert!((epoch & EPOCH_SPILL_TIME_MASK) == 0); | ||
| EpochWithGap(epoch + spill_offset) |
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #13881 +/- ##
=======================================
Coverage 68.22% 68.22%
=======================================
Files 1525 1525
Lines 262188 262189 +1
=======================================
+ Hits 178867 178878 +11
+ Misses 83321 83311 -10
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
wenym1
approved these changes
Dec 8, 2023
src/common/src/util/epoch.rs
Outdated
| // Low EPOCH_AVAILABLE_BITS bits set to 1 | ||
| pub const EPOCH_SPILL_TIME_MASK: u64 = (1 << EPOCH_AVAILABLE_BITS) - 1; | ||
| // High (64-EPOCH_AVAILABLE_BITS) bits set to 1 | ||
| pub const EPOCH_MASK: u64 = !EPOCH_SPILL_TIME_MASK; |
There was a problem hiding this comment.
The EPOCH_MASK is fully flipped compared to before this PR. It is used anywhere else? If not I think we can remove this const or make it private.
huangjw806
pushed a commit
that referenced
this pull request
Dec 11, 2023
…ch (#13881) (#13892) Co-authored-by: Zhanxiang (Patrick) Huang <[email protected]>
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.
I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.
What's changed and what's your intention?
#13696 fixes the max epoch bug for range tombstone but introduces a overflow panic when the provided epoch is u64::MAX. For example, the HummockEpoch::MAX epoch here will be later used to create EpochWithGap with MAX_SPILL_TIMES, which will cause a u64 overflow. This panic will be 100% triggered for sinks with log store enabled.
This PR fixes the issue by treating epochs in [MAX_EPOCH, u64::MAX] as the maximum EpochWithGap(u64::MAX).
Checklist
./risedev check(or alias,./risedev c)Documentation
Release note
If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.