Skip to content
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

refactor: add target_offsets to determinine if source backfill finished #18297

Conversation

xxchan
Copy link
Member

@xxchan xxchan commented Aug 28, 2024

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

What's changed and what's your intention?

step 1 of #18299, see there for the motivation and a state diagram of the new design.

The main idea of the code change is to consolidate logic into handle_upstream_row and handle_backfill_row.

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.

Copy link
Member Author

xxchan commented Aug 28, 2024

Base automatically changed from 08-28-refactor_simplify_sourcebackfill_s_memory_state to main August 28, 2024 09:32
@xxchan xxchan force-pushed the 08-24-refactor_add_target_offsets_to_determinine_if_source_backfill_finished branch 2 times, most recently from e9f69ef to 27cf1fc Compare August 30, 2024 09:35
@@ -727,6 +766,18 @@ impl<S: StateStore> SourceBackfillExecutorInner<S> {
debug_assert_eq!(old_states, target_state);
}
stage.states = target_state;
stage.splits = target_splits;
Copy link
Member Author

Choose a reason for hiding this comment

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

@xxchan xxchan force-pushed the 08-24-refactor_add_target_offsets_to_determinine_if_source_backfill_finished branch from 27cf1fc to aa5610d Compare August 30, 2024 09:37
@xxchan xxchan marked this pull request as ready for review August 30, 2024 09:39
Copy link
Member

@BugenZhao BugenZhao left a comment

Choose a reason for hiding this comment

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

Good

src/stream/src/executor/source/source_backfill_executor.rs Outdated Show resolved Hide resolved
Comment on lines +770 to +780
let old_target_offsets = std::mem::take(&mut stage.target_offsets);
stage.target_offsets = stage
.states
.keys()
.map(|split_id| {
(
split_id.clone(),
old_target_offsets.get(split_id).cloned().flatten(),
)
})
.collect();
Copy link
Member

Choose a reason for hiding this comment

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

HashMap::retain?

Copy link
Member Author

Choose a reason for hiding this comment

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

Need to consider newly added splits.

@xxchan xxchan force-pushed the 08-24-refactor_add_target_offsets_to_determinine_if_source_backfill_finished branch from aa5610d to 272a7a4 Compare September 2, 2024 08:03
@xxchan xxchan force-pushed the 08-24-refactor_add_target_offsets_to_determinine_if_source_backfill_finished branch from c8b80b7 to 2b8f062 Compare September 2, 2024 08:08
Copy link
Contributor

@chenzl25 chenzl25 left a comment

Choose a reason for hiding this comment

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

Great!

@xxchan xxchan added this pull request to the merge queue Sep 3, 2024
Merged via the queue into main with commit 46bce7e Sep 3, 2024
30 of 31 checks passed
@xxchan xxchan deleted the 08-24-refactor_add_target_offsets_to_determinine_if_source_backfill_finished branch September 3, 2024 04:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants