Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: don't silently drop errors encountered in table scan file planning #535

Merged
merged 1 commit into from
Aug 13, 2024
Merged

fix: don't silently drop errors encountered in table scan file planning #535

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions crates/iceberg/src/scan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,18 +308,26 @@ impl TableScan {
.plan_context
.build_manifest_file_contexts(manifest_list, manifest_entry_ctx_tx)?;

let mut channel_for_manifest_error = file_scan_task_tx.clone();

// Concurrently load all [`Manifest`]s and stream their [`ManifestEntry`]s
spawn(async move {
futures::stream::iter(manifest_file_contexts)
let result = futures::stream::iter(manifest_file_contexts)
.try_for_each_concurrent(concurrency_limit_manifest_files, |ctx| async move {
ctx.fetch_manifest_and_stream_manifest_entries().await
})
.await
.await;

if let Err(error) = result {
let _ = channel_for_manifest_error.send(Err(error)).await;
}
});

let mut channel_for_manifest_entry_error = file_scan_task_tx.clone();

// Process the [`ManifestEntry`] stream in parallel
spawn(async move {
manifest_entry_ctx_rx
let result = manifest_entry_ctx_rx
.map(|me_ctx| Ok((me_ctx, file_scan_task_tx.clone())))
.try_for_each_concurrent(
concurrency_limit_manifest_entries,
Expand All @@ -330,7 +338,11 @@ impl TableScan {
.await
},
)
.await
.await;

if let Err(error) = result {
let _ = channel_for_manifest_entry_error.send(Err(error)).await;
}
});

return Ok(file_scan_task_rx.boxed());
Expand Down
Loading