refactor(meta): do not store upstream actors in merge node #20222
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
wenym1
force-pushed
the
yiming/merge-node-no-upstream-actors
branch
from
f490830 to
58bcf47
Compare
|
This pull request has been modified. If you want me to regenerate unit test for any of the files related, please find the file in "Files Changed" tab and add a comment |
wenym1
force-pushed
the
yiming/merge-node-no-upstream-actors
branch
from
58bcf47 to
0e9e387
Compare
wenym1
changed the title
wenym1
force-pushed
the
yiming/merge-node-no-upstream-actors
branch
from
0e9e387 to
53af608
Compare
This stack of pull requests is managed by Graphite. Learn more about stacking. |
8 tasks
wenym1
force-pushed
the
yiming/merge-node-no-upstream-actors
branch
from
16121c8 to
9946e87
Compare
BugenZhao
approved these changes
Jan 27, 2025
| } | ||
|
|
||
| stream_plan.StreamActor actor = 1; | ||
| map<uint32, UpstreamActors> upstreams = 2; |
There was a problem hiding this comment.
Can we name it fragment_upstreams?
| upstream_dispatcher_type: DispatcherType::Hash as _, | ||
| fields: sink_fields.to_vec(), | ||
| **merge_node = { | ||
| #[expect(deprecated)] |
There was a problem hiding this comment.
Is it possible to move the attributes onto the field?
| @@ -126,11 +128,18 @@ impl ActorBuilder { | |||
| /// 1. Replace the logical `Exchange` in node's input with `Merge`, which can be executed on the | |||
| /// compute nodes. | |||
| /// 2. Fill the upstream mview info of the `Merge` node under the other "leaf" nodes. | |||
There was a problem hiding this comment.
Shall we also update the docs?
| @@ -550,7 +550,7 @@ message MergeNode { | |||
| // | |||
| // `upstream_actor_id` stored in the plan node in `Fragment` meta model cannot be directly used. | |||
| // See `compose_fragment`. | |||
| repeated uint32 upstream_actor_id = 1; | |||
| repeated uint32 upstream_actor_id = 1 [deprecated = true]; | |||
There was a problem hiding this comment.
Can we add some explanation of the deprecation? Also for StreamActor.
BugenZhao
added
the
ci/run-backwards-compat-tests
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?
Previously we store the upstream actors information of each actor in the
upstream_actor_idofNodeBody::MergeofStreamNodeof eachStreamActor. This is the only difference ofStreamNodefor each actor in a same fragment. In this PR, we will change to store the upstream actor information in a separate field besidesStreamActor.We define type alias
In code of meta node, most appearance of
StreamActorwill be replaced withStreamActorWithUpstreams, so that the upstreams information can be carried together with usage to originalStreamActor. The fieldupstream_actor_idofMergeNodeandStreamActoris marked deprecated in the proto definition, so that we can review all the original on the fields, to ensure the refactor logic is correct.Checklist
Documentation
Release note