Skip to content

fix(storage): replace imms with merged imms in any position of staging #14756

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.

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

Merged
merged 6 commits into from
Jan 25, 2024

Conversation

wenym1
Copy link
Contributor

@wenym1 wenym1 commented Jan 23, 2024

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

Fix #14743
Fix #14724

In this PR, in the HummockReadVersion, we will not distinguish between imms and merged_imms. All imms will be in a single queue. A MergedImm version update will not require that the input imms are a suffix of the staging imm list, but only requires that they are consecutive in the staging imm list, and when applying the version update, such consecutive range of list will be replaced by output merged imm.

Some sanity check and logs are added by the way.

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added test labels as necessary. See details.
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

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.

@wenym1 wenym1 requested review from StrikeW and hzxa21 January 23, 2024 12:44
@github-actions github-actions bot added the type/fix Type: Bug fix. Only for pull requests. label Jan 23, 2024
@kwannoel kwannoel self-requested a review January 23, 2024 12:52
Copy link
Collaborator

@hzxa21 hzxa21 left a comment

Choose a reason for hiding this comment

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

Let's add a UT to cover #14743 (maybe via pushing events to event handler)

@wenym1
Copy link
Contributor Author

wenym1 commented Jan 24, 2024

Let's add a UT to cover #14743 (maybe via pushing events to event handler)

Unit test added

Copy link
Collaborator

@hzxa21 hzxa21 left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks for the quick fix.

@wenym1 wenym1 added this pull request to the merge queue Jan 24, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 24, 2024
@wenym1 wenym1 enabled auto-merge January 24, 2024 11:00
@wenym1 wenym1 added this pull request to the merge queue Jan 25, 2024
Merged via the queue into main with commit c8030fc Jan 25, 2024
@wenym1 wenym1 deleted the yiming/merge-imm-any-pos branch January 25, 2024 06:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/fix Type: Bug fix. Only for pull requests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bug: merge imm can truncate incorrect imm in read version when I/O is slow rw-main panicked at src/storage/src/hummock/store/version.rs:470:17
3 participants