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

return lazy iterator in get tombstone methods #452

Merged
merged 1 commit into from
Oct 9, 2021
Merged

return lazy iterator in get tombstone methods #452

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion rust/src/checkpoints.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ fn parquet_bytes_from_state(state: &DeltaTableState) -> Result<Vec<u8>, Checkpoi
let mut stats_conversions: Vec<(SchemaPath, SchemaDataType)> = Vec::new();
collect_stats_conversions(&mut stats_conversions, current_metadata.schema.get_fields());

let mut tombstones = state.unexpired_tombstones();
let mut tombstones = state.unexpired_tombstones().cloned().collect::<Vec<_>>();

// if any, tombstones do not include extended file metadata, we must omit the extended metadata fields from the remove schema
// See https://github.com/delta-io/delta/blob/master/PROTOCOL.md#add-file-and-remove-file
Expand Down
8 changes: 3 additions & 5 deletions rust/src/delta.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,13 +392,11 @@ impl DeltaTableState {

/// List of unexpired tombstones (remove actions) representing files removed from table state.
/// The retention period is set by `deletedFileRetentionDuration` with default value of 1 week.
pub fn unexpired_tombstones(&self) -> Vec<action::Remove> {
pub fn unexpired_tombstones(&self) -> impl Iterator<Item = &action::Remove> {
let retention_timestamp = Utc::now().timestamp_millis() - self.tombstone_retention_millis;
self.tombstones
.iter()
.filter(|t| t.deletion_timestamp.unwrap_or(0) > retention_timestamp)
.cloned()
.collect()
.filter(move |t| t.deletion_timestamp.unwrap_or(0) > retention_timestamp)
}

/// Full list of add actions representing all parquet files that are part of the current
Expand Down Expand Up @@ -1086,7 +1084,7 @@ impl DeltaTable {
}

/// Returns a vector of active tombstones (i.e. `Remove` actions present in the current delta log).
pub fn get_tombstones(&self) -> Vec<action::Remove> {
pub fn get_tombstones(&self) -> impl Iterator<Item = &action::Remove> {
self.state.unexpired_tombstones()
}

Expand Down