Skip to content

Commit

Permalink
resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
zhyass committed Oct 15, 2023
1 parent 7b293d4 commit 338038d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,11 @@ pub fn build_recluster_physical_plan(
removed_segment_summary: Statistics,
) -> Result<PhysicalPlan> {
let is_distributed = tasks.len() > 1;
let mut root = PhysicalPlan::ReclusterSource(ReclusterSource {
let mut root = PhysicalPlan::ReclusterSource(Box::new(ReclusterSource {
tasks,
table_info: table_info.clone(),
catalog_info: catalog_info.clone(),
});
}));

if is_distributed {
root = PhysicalPlan::Exchange(Exchange {
Expand All @@ -246,13 +246,13 @@ pub fn build_recluster_physical_plan(
});
}

Ok(PhysicalPlan::ReclusterSink(ReclusterSink {
Ok(PhysicalPlan::ReclusterSink(Box::new(ReclusterSink {
input: Box::new(root),
table_info,
catalog_info,
snapshot,
remained_blocks,
removed_segment_indexes,
removed_segment_summary,
}))
})))
}
4 changes: 2 additions & 2 deletions src/query/service/src/schedulers/fragments/plan_fragment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -458,10 +458,10 @@ struct ReplaceReclusterSource {

impl PhysicalPlanReplacer for ReplaceReclusterSource {
fn replace_recluster_source(&mut self, plan: &ReclusterSource) -> Result<PhysicalPlan> {
Ok(PhysicalPlan::ReclusterSource(ReclusterSource {
Ok(PhysicalPlan::ReclusterSource(Box::new(ReclusterSource {
tasks: vec![self.task.clone()],
..plan.clone()
}))
})))
}
}

Expand Down

0 comments on commit 338038d

Please sign in to comment.