refactor: replace more GAT-based async trait with RPITIT #12271
Merged
Conversation
This file contains hidden or 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
Signed-off-by: Bugen Zhao <[email protected]>
wangrunji0408
approved these changes
Sep 13, 2023
Comment on lines
-97
to
+92
| type SnapshotStream<'a> = impl Stream<Item = StreamExecutorResult<Option<StreamChunk>>> + 'a; | ||
|
|
||
| fn snapshot_read(&self, args: SnapshotReadArgs) -> Self::SnapshotStream<'_> { | ||
| #[try_stream] | ||
| async move { | ||
| let primary_keys = self | ||
| .inner | ||
| .pk_indices() | ||
| .iter() | ||
| .map(|idx| { | ||
| let f = &self.inner.schema().fields[*idx]; | ||
| f.name.clone() | ||
| }) | ||
| .collect_vec(); | ||
|
|
||
| tracing::debug!( | ||
| "snapshot_read primary keys: {:?}, current_pos: {:?}", | ||
| primary_keys, | ||
| args.current_pos | ||
| ); | ||
|
|
||
| let row_stream = self.inner.table_reader().snapshot_read( | ||
| self.inner.schema_table_name(), | ||
| args.current_pos, | ||
| primary_keys, | ||
| ); | ||
|
|
||
| pin_mut!(row_stream); | ||
|
|
||
| let mut builder = | ||
| DataChunkBuilder::new(self.inner.schema().data_types(), args.chunk_size); | ||
| let chunk_stream = iter_chunks(row_stream, &mut builder); | ||
| #[for_await] | ||
| for chunk in chunk_stream { | ||
| yield chunk?; | ||
| } | ||
| #[try_stream(ok = Option<StreamChunk>, error = StreamExecutorError)] | ||
| async fn snapshot_read(&self, args: SnapshotReadArgs) { |
There was a problem hiding this comment.
Looks like we can also use #[try_stream] in impl Executor to avoid the indirect execute_inner. 🤔
There was a problem hiding this comment.
Yeah, I believe it's true.
Codecov Report
@@ Coverage Diff @@
## main #12271 +/- ##
=======================================
Coverage 69.72% 69.72%
=======================================
Files 1411 1411
Lines 236365 236326 -39
=======================================
- Hits 164807 164782 -25
+ Misses 71558 71544 -14
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 4 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
StrikeW
approved these changes
Sep 13, 2023
Li0k
pushed a commit
that referenced
this pull request
Sep 15, 2023
Signed-off-by: Bugen Zhao <[email protected]>
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?
Hide the whitespaces and you'll find few changes.
As
return-position-impl-trait-in-traitis now complete, we can replace more GAT-based async trait with that.async-fn-in-traitandreturn-position-impl-trait-in-trait#10554Checklist
./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.