Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 58 additions & 6 deletions crates/iceberg/src/arrow/caching_delete_file_loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,11 @@ impl CachingDeleteFileLoader {
) -> Self {
let scan_metrics = ScanMetrics::new();
CachingDeleteFileLoader {
basic_delete_file_loader: BasicDeleteFileLoader::new(file_io, scan_metrics),
basic_delete_file_loader: BasicDeleteFileLoader::new(
file_io,
scan_metrics,
runtime.clone(),
),
concurrency_limit_data_files,
delete_filter: DeleteFilter::new(runtime.clone()),
runtime,
Expand All @@ -112,6 +116,7 @@ impl CachingDeleteFileLoader {
self.basic_delete_file_loader = BasicDeleteFileLoader::new(
self.basic_delete_file_loader.file_io().clone(),
scan_metrics,
self.runtime.clone(),
);
self
}
Expand Down Expand Up @@ -204,20 +209,25 @@ impl CachingDeleteFileLoader {
let del_filter = self.delete_filter.clone();
let concurrency_limit_data_files = self.concurrency_limit_data_files;
let basic_delete_file_loader = self.basic_delete_file_loader.clone();
self.runtime.io().spawn(async move {
let io = self.runtime.io().clone();
// Decode Parquet batches and construct delete filters on CPU workers.
// Storage operations are dispatched separately to the I/O runtime.
self.runtime.cpu().spawn(async move {
let result = async move {
let mut del_filter = del_filter;
let basic_delete_file_loader = basic_delete_file_loader.clone();

let mut results_stream = task_stream
.map(move |(task, file_io, del_filter, schema)| {
let basic_delete_file_loader = basic_delete_file_loader.clone();
let io = io.clone();
async move {
Self::load_file_for_task(
&task,
basic_delete_file_loader.clone(),
del_filter,
schema,
io,
)
.await
}
Expand Down Expand Up @@ -262,13 +272,20 @@ impl CachingDeleteFileLoader {
basic_delete_file_loader: BasicDeleteFileLoader,
del_filter: DeleteFilter,
schema: SchemaRef,
io: crate::runtime::RuntimeHandle,
) -> Result<DeleteFileContext> {
match task.file_type() {
DataContentType::PositionDeletes => {
// A V3 deletion vector arrives as a PositionDeletes entry whose deletes live in
// a Puffin blob, not in a positional-delete parquet file.
if task.file_format() == DataFileFormat::Puffin {
return Self::load_deletion_vector(task, basic_delete_file_loader).await;
let task = task.clone();
return io
.spawn(async move {
Self::load_deletion_vector(&task, basic_delete_file_loader).await
})
.abort_on_drop()
.await?;
}

match del_filter.try_start_pos_del_load(task.file_path()) {
Expand Down Expand Up @@ -840,6 +857,41 @@ mod tests {
use crate::spec::{DataContentType, DataFileFormat, Schema};
use crate::test_utils::encode_dv_blob;

#[test]
fn delete_loading_requires_cpu_runtime() {
let io = tokio::runtime::Builder::new_multi_thread()
.worker_threads(1)
.enable_all()
.build()
.unwrap();
// Deliberately not driven until after the I/O runtime has had a chance
// to run. A loader accidentally spawned on I/O would finish early.
let cpu = tokio::runtime::Builder::new_current_thread()
.enable_all()
.build()
.unwrap();
let runtime = Runtime::new_with_split(&io, &cpu);
let dir = TempDir::new().unwrap();
let tasks = setup(dir.path());
let loader = CachingDeleteFileLoader::new(FileIO::new_with_fs(), 2, runtime);
let mut loaded = loader.load_deletes(tasks[0].deletes(), tasks[0].schema_ref());
io.block_on(async {
assert!(
tokio::time::timeout(std::time::Duration::from_millis(100), &mut loaded)
.await
.is_err()
);
});
let filter = cpu.block_on(async {
tokio::time::timeout(std::time::Duration::from_secs(5), loaded)
.await
.unwrap()
.unwrap()
.unwrap()
});
assert!(filter.get_delete_vector(&tasks[0]).is_some());
}

#[test]
fn test_deserialized_deletion_vector_rejects_missing_fields() {
// A deletion vector that omits its required coordinates fails validation
Expand Down Expand Up @@ -869,7 +921,7 @@ mod tests {
let eq_delete_file_path = setup_write_equality_delete_file_1(table_location);

let basic_delete_file_loader =
BasicDeleteFileLoader::new(file_io.clone(), ScanMetrics::new());
BasicDeleteFileLoader::new(file_io.clone(), ScanMetrics::new(), Runtime::current());
let record_batch_stream = basic_delete_file_loader
.parquet_to_batch_stream(
&eq_delete_file_path,
Expand Down Expand Up @@ -1307,7 +1359,7 @@ mod tests {

let file_io = FileIO::new_with_fs();
let basic_delete_file_loader =
BasicDeleteFileLoader::new(file_io.clone(), ScanMetrics::new());
BasicDeleteFileLoader::new(file_io.clone(), ScanMetrics::new(), Runtime::current());

let batch_stream = basic_delete_file_loader
.parquet_to_batch_stream(
Expand Down Expand Up @@ -1488,7 +1540,7 @@ mod tests {
writer.close().unwrap();

let basic_delete_file_loader =
BasicDeleteFileLoader::new(file_io.clone(), ScanMetrics::new());
BasicDeleteFileLoader::new(file_io.clone(), ScanMetrics::new(), Runtime::current());
let record_batch_stream = basic_delete_file_loader
.parquet_to_batch_stream(&path, std::fs::metadata(&path).unwrap().len(), None)
.await
Expand Down
14 changes: 10 additions & 4 deletions crates/iceberg/src/arrow/delete_file_loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,16 @@ pub trait DeleteFileLoader {
pub(crate) struct BasicDeleteFileLoader {
file_io: FileIO,
scan_metrics: ScanMetrics,
runtime: crate::Runtime,
}

#[allow(unused_variables)]
impl BasicDeleteFileLoader {
pub fn new(file_io: FileIO, scan_metrics: ScanMetrics) -> Self {
pub fn new(file_io: FileIO, scan_metrics: ScanMetrics, runtime: crate::Runtime) -> Self {
BasicDeleteFileLoader {
file_io,
scan_metrics,
runtime,
}
}

Expand All @@ -78,6 +80,7 @@ impl BasicDeleteFileLoader {
let (parquet_file_reader, arrow_metadata) = ArrowReader::open_parquet_file(
data_file_path,
&self.file_io,
&self.runtime,
file_size_in_bytes,
parquet_read_options,
self.scan_metrics.bytes_read_counter(),
Expand Down Expand Up @@ -156,7 +159,8 @@ mod tests {
let file_io = FileIO::new_with_fs();

let scan_metrics = ScanMetrics::new();
let delete_file_loader = BasicDeleteFileLoader::new(file_io.clone(), scan_metrics);
let delete_file_loader =
BasicDeleteFileLoader::new(file_io.clone(), scan_metrics, crate::Runtime::current());

let file_scan_tasks = setup(table_location);

Expand Down Expand Up @@ -241,7 +245,8 @@ mod tests {
.unwrap();

let scan_metrics = ScanMetrics::new();
let delete_file_loader = BasicDeleteFileLoader::new(file_io, scan_metrics);
let delete_file_loader =
BasicDeleteFileLoader::new(file_io, scan_metrics, crate::Runtime::current());

let result = delete_file_loader
.read_delete_file(&task, schema)
Expand Down Expand Up @@ -317,7 +322,8 @@ mod tests {
.unwrap();

let scan_metrics = ScanMetrics::new();
let delete_file_loader = BasicDeleteFileLoader::new(file_io, scan_metrics);
let delete_file_loader =
BasicDeleteFileLoader::new(file_io, scan_metrics, crate::Runtime::current());

let result = delete_file_loader
.read_delete_file(&task, schema)
Expand Down
1 change: 1 addition & 0 deletions crates/iceberg/src/arrow/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ mod reader;
pub mod record_batch_projector;
pub(crate) mod record_batch_transformer;
pub(crate) use record_batch_transformer::build_partition_constant;
mod runtime_file_read;
mod scan_metrics;
mod value;

Expand Down
Loading
Loading