Skip to content
Merged
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
19 changes: 16 additions & 3 deletions crates/iceberg/src/scan/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,8 @@ impl PlanContext {
};

// TODO: Ideally we could ditch this intermediate Vec as we return an iterator.
let mut filtered_mfcs = vec![];
let mut filtered_deletes_mfcs = vec![];
let mut filtered_data_mfcs = vec![];

for manifest_file in &manifest_files {
let (delete_file_idx, tx) = if manifest_file.content == ManifestContentType::Deletes {
Expand Down Expand Up @@ -313,10 +314,22 @@ impl PlanContext {
filter_fn.clone(),
);

filtered_mfcs.push(Ok(mfc));
match manifest_file.content {
ManifestContentType::Deletes => {
filtered_deletes_mfcs.push(Ok(mfc));
}
ManifestContentType::Data => {
filtered_data_mfcs.push(Ok(mfc));
}
}
}

Ok(Box::new(filtered_mfcs.into_iter()))
// Push deletes manifest first then data manifest files.
Ok(Box::new(
filtered_deletes_mfcs
.into_iter()
.chain(filtered_data_mfcs.into_iter()),
))
}

fn create_manifest_file_context(
Expand Down
3 changes: 1 addition & 2 deletions crates/iceberg/src/scan/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -456,8 +456,7 @@ impl TableScan {
.send(Err(error))
.await;
}
})
.await;
});
}

let mut channel_for_data_manifest_entry_error = file_scan_task_tx.clone();
Expand Down
Loading