Skip to content

Commit 651f117

Browse files
committed
simpler
Signed-off-by: Adam Gutglick <adam@spiraldb.com>
1 parent 0ee645b commit 651f117

1 file changed

Lines changed: 2 additions & 13 deletions

File tree

  • vortex-datafusion/src/persistent/morsel

‎vortex-datafusion/src/persistent/morsel/mod.rs‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -587,14 +587,13 @@ impl MorselPlanner for VortexMorselPlanner {
587587
split_ranges,
588588
} => {
589589
let total_size = state.file.object_meta.size;
590-
let compute_layout_reader = Arc::clone(&layout_reader);
591590

592591
Ok(Some(
593592
MorselPlan::new().with_pending_planner(
594593
async move {
595594
let split_ranges = split_ranges
596-
.get_or_try_init(|| {
597-
compute_natural_split_ranges_async(compute_layout_reader)
595+
.get_or_try_init(|| async {
596+
compute_natural_split_ranges(layout_reader.as_ref())
598597
})
599598
.await?;
600599

@@ -913,16 +912,6 @@ fn natural_split_cell_for_file(
913912
}
914913
}
915914

916-
async fn compute_natural_split_ranges_async(
917-
layout_reader: Arc<dyn LayoutReader>,
918-
) -> DFResult<NaturalSplitRanges> {
919-
tokio::task::spawn_blocking(move || compute_natural_split_ranges(layout_reader.as_ref()))
920-
.await
921-
.map_err(|error| {
922-
exec_datafusion_err!("Vortex natural split calculation task failed: {error}")
923-
})?
924-
}
925-
926915
fn compute_natural_split_ranges(layout_reader: &dyn LayoutReader) -> DFResult<NaturalSplitRanges> {
927916
let row_count = layout_reader.row_count();
928917
let row_range = 0..row_count;

0 commit comments

Comments
 (0)