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: bump await-tree to 0.2 #16035

Merged
merged 6 commits into from
Apr 4, 2024
Merged

refactor: bump await-tree to 0.2 #16035

merged 6 commits into from
Apr 4, 2024

Conversation

BugenZhao
Copy link
Member

Signed-off-by: Bugen Zhao [email protected]I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

Improvements introduced in await-tree 0.2:

  • Registry now provides interior mutability. No need for wrapping like Arc<Mutex<..>>.
  • Different key types can be used in a single registry, allowing us to
    • reuse the same registry for different tasks in the process, to simplify the code
    • classify tasks with type information

This is a preparation for #14131.

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • All checks passed in ./risedev check (or alias, ./risedev c)

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.

Signed-off-by: Bugen Zhao <[email protected]>
Signed-off-by: Bugen Zhao <[email protected]>
Signed-off-by: Bugen Zhao <[email protected]>
@BugenZhao BugenZhao requested review from fuyufjh, xxchan and wenym1 April 1, 2024 07:29
@BugenZhao BugenZhao requested a review from a team as a code owner April 1, 2024 07:29
@@ -744,8 +738,7 @@ impl LocalBarrierWorker {
pub fn spawn(
env: StreamEnvironment,
streaming_metrics: Arc<StreamingMetrics>,
await_tree_reg: Option<Arc<Mutex<await_tree::Registry<ActorId>>>>,
barrier_await_tree_reg: Option<Arc<Mutex<await_tree::Registry<u64>>>>,
Copy link
Member Author

Choose a reason for hiding this comment

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

These two registries are merged together and trees can be distinguished by key types.

Copy link
Contributor

@TennyZhuang TennyZhuang left a comment

Choose a reason for hiding this comment

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

cool

.map(|(k, v)| (k, v.to_string()))
.collect();
let actor_traces = if let Some(reg) = self.stream_mgr.await_tree_reg() {
reg.collect::<Actor>()
Copy link
Member

Choose a reason for hiding this comment

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

😮

@BugenZhao BugenZhao added this pull request to the merge queue Apr 4, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 4, 2024
@BugenZhao BugenZhao enabled auto-merge April 4, 2024 06:03
@BugenZhao BugenZhao added this pull request to the merge queue Apr 4, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 4, 2024
@BugenZhao BugenZhao added this pull request to the merge queue Apr 4, 2024
Merged via the queue into main with commit dfe5f31 Apr 4, 2024
28 of 29 checks passed
@BugenZhao BugenZhao deleted the bz/bump-await-tree-0.2 branch April 4, 2024 08:22
yezizp2012 pushed a commit that referenced this pull request Apr 7, 2024
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