[FEAT] Add concat to new execution model + buffered intermediate ops #2519
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2519 +/- ##
=======================================
Coverage ? 63.22%
=======================================
Files ? 972
Lines ? 108363
Branches ? 0
=======================================
Hits ? 68517
Misses ? 39846
Partials ? 0
|
samster25
reviewed
Jul 16, 2024
| pub trait IntermediateOperator: dyn_clone::DynClone + Send + Sync { | ||
| fn execute(&self, input: &Arc<MicroPartition>) -> DaftResult<Arc<MicroPartition>>; | ||
| fn name(&self) -> &'static str; | ||
| } | ||
|
|
||
| dyn_clone::clone_trait_object!(IntermediateOperator); | ||
|
|
||
| /// The number of rows that will trigger an intermediate operator to output its data. | ||
| pub const OUTPUT_THRESHOLD: usize = 1000; |
There was a problem hiding this comment.
have this as an env variable with a default
|
|
||
| pub fn add(&mut self, part: Arc<MicroPartition>) { | ||
| self.buffer.push(part); | ||
| self.curr_len += 1; |
| pub const OUTPUT_THRESHOLD: usize = 1000; | ||
|
|
||
| /// State of an operator task, used to buffer data and output it when a threshold is reached. | ||
| pub struct OperatorTaskState { |
There was a problem hiding this comment.
No action needed but we should refactor this to be a trait that is serde-able so diff operators can have diff impls.
| } | ||
| } | ||
|
|
||
| async fn single_operator_task( |
| Ok(()) | ||
| } | ||
|
|
||
| pub async fn run(&mut self) -> DaftResult<()> { |
| if let Some(s) = inner_task_senders.get(curr_sender_idx) { | ||
| let _ = s.send(morsel).await; | ||
| } else { | ||
| let next_sender = self.sender.get_next_sender(); |
There was a problem hiding this comment.
doesn't exist so create the task runner.
| let (single_sender, single_receiver) = create_single_channel(1); | ||
|
|
||
| let op = self.op.clone(); | ||
| tokio::spawn(async move { |
There was a problem hiding this comment.
we shouldn't have any tokio::spawn in our code. have a util function that is called
spawn_compute(...)
| tokio::spawn(async move { | ||
| let _ = Self::single_operator_task(single_receiver, next_sender, op).await; | ||
| }); | ||
| let _ = single_sender.send(morsel).await; |
src/daft-local-execution/src/lib.rs
Outdated
| } | ||
| } | ||
|
|
||
| pub fn blocking_recv(&mut self) -> Option<DaftResult<Arc<MicroPartition>>> { |
| Ok(Box::new(res)) | ||
| } | ||
|
|
||
| pub fn run_physical_plan( |
There was a problem hiding this comment.
decouple, building pipeline and starting execution.
- build full pipeline
- run
startfor each op - then wait on result
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.
This PR adds Concat and buffered intermediate ops to the new execution model, in addition to some refactors to support this change.
n.