-
Notifications
You must be signed in to change notification settings - Fork 592
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(stream): refactor trait Executor
to get rid of info()
#15167
Conversation
Signed-off-by: Richard Chien <[email protected]>
Signed-off-by: Richard Chien <[email protected]>
Signed-off-by: Richard Chien <[email protected]>
Signed-off-by: Richard Chien <[email protected]>
Signed-off-by: Richard Chien <[email protected]>
Signed-off-by: Richard Chien <[email protected]>
Signed-off-by: Richard Chien <[email protected]>
Signed-off-by: Richard Chien <[email protected]>
Signed-off-by: Richard Chien <[email protected]>
|
GitGuardian id | GitGuardian status | Secret | Commit | Filename | |
---|---|---|---|---|---|
9425213 | Triggered | Generic Password | 9f895fc | ci/scripts/regress-test.sh | View secret |
🛠 Guidelines to remediate hardcoded secrets
- Understand the implications of revoking this secret by investigating where it is used in your code.
- Replace and store your secret safely. Learn here the best practices.
- Revoke and rotate this secret.
- If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.
To avoid such incidents in the future consider
- following these best practices for managing and storing secrets including API keys and other credentials
- install secret detection on pre-commit to catch secret before it leaves your machine and ease remediation.
🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.
Our GitHub checks need improvements? Share your feedbacks!
Can we drop |
Maybe possible, at least we can |
Signed-off-by: Richard Chien <[email protected]>
Signed-off-by: Richard Chien <[email protected]>
Signed-off-by: Richard Chien <[email protected]>
|
||
fn identity(&self) -> &str { | ||
&self.identity | ||
} | ||
} | ||
|
||
#[tokio::test] | ||
async fn test_cdc_backfill() -> StreamResult<()> { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@StrikeW Please help check if this test is as expected after change, thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
confirmed. I will add assert in the test later.
let mut info = params.info.clone(); | ||
info.identity = format!("{} (flow controlled)", info.identity); | ||
|
||
let exec = FlowControlExecutor::new( | ||
(info, exec).into(), | ||
params.actor_context, | ||
node.rate_limit.map(|x| x as _), | ||
) | ||
.boxed()) | ||
); | ||
Ok((params.info, exec).into()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems if we don't wrap FlowControlExecutor
directly in new_boxed_executor
but to let it have a dedicated from_proto
, we can make new_boxed_executor
return Box<dyn Execute>
instead of Executor
, further reducing the possibility to return an inconsistent info.
let checked = epoch_check(source.info().into(), source.boxed().execute()); | ||
let (_, source) = MockSource::channel(); | ||
let source = source | ||
.stop_on_finish(false) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is why we cannot directly return Executor
from MockSource::channel()
Signed-off-by: Richard Chien <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great to me!
|
||
fn identity(&self) -> &str { | ||
&self.identity | ||
} | ||
} | ||
|
||
#[tokio::test] | ||
async fn test_cdc_backfill() -> StreamResult<()> { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
confirmed. I will add assert in the test later.
Signed-off-by: Richard Chien <[email protected]>
I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.
What's changed and what's your intention?
As part of the effort to ensure correctness of executor info (#12459), this PR refactors the
Executor
trait to make executor implementations not aware ofExecutorInfo
.Main changes happen in
src/stream/src/executor/mod.rs
:info()
schema()
pk_indices()
identity()
methods fromExecutor
trait;Executor
trait toExecute
since its only method isexecute
;info
fields from executors (except HashAgg, HashJoin, SimpleAgg, Sink, TemporalJoin, for not making this PR too big);Executor
struct to combineExecutorInfo
andBox<dyn Execute>
, so that (almost) everywhere we usedBox<dyn Executor>
before, we useExecutor
now.Other files are just changed accordingly.
Why?
You may ask why change so. As you may find, most of our
Executor
implementations contain aninfo: ExecutorInfo
field, but never access it. It's only used whenimpl Executor
, returned ininfo()
method. In most cases, an executor's info is only accessed by its downstream, if the downstream needs that (mostly to get thepk_indices
as someinput pk
). Only a few executors need to access itself'sschema
to create output array builders.This situation has two problems:
info
field, the method implementations inimpl Executor
and the incorrect but insignificant executor info in executor unit tests;By moving the
info
field out ofExecutor
trait (nowExecute
), we can make it easier to directly useExecutorParams
'sinfo
as the executor info and make executor implementations clean and neat.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.