refactor: rename ScopedDeltaResultIterator

Author: kyli87

delta-kernel-unity-catalog/src/committer.rs

@@ -4,7 +4,7 @@ use delta_kernel::committer::{
     CommitMetadata, CommitResponse, CommitType, Committer, PublishMetadata,
 };
 use delta_kernel::{
-    DeltaResult, Engine, Error as DeltaError, FilteredEngineData, ScopedDeltaResultIterator,
+    DeltaResult, DeltaResultIterator, Engine, Error as DeltaError, FilteredEngineData,
 };
 use tracing::{debug, info};
 use unity_catalog_delta_client_api::{Commit, CommitClient, CommitRequest};
@@ -125,7 +125,7 @@ impl<C: CommitClient> UCCommitter<C> {
     fn commit_version_0(
         &self,
         engine: &dyn Engine,
-        actions: ScopedDeltaResultIterator<'_, FilteredEngineData>,
+        actions: DeltaResultIterator<'_, FilteredEngineData>,
         commit_metadata: &CommitMetadata,
     ) -> DeltaResult<CommitResponse> {
         debug_assert!(
@@ -158,7 +158,7 @@ impl<C: CommitClient> UCCommitter<C> {
     fn commit_version_non_zero(
         &self,
         engine: &dyn Engine,
-        actions: ScopedDeltaResultIterator<'_, FilteredEngineData>,
+        actions: DeltaResultIterator<'_, FilteredEngineData>,
         commit_metadata: CommitMetadata,
     ) -> DeltaResult<CommitResponse>
     where
@@ -239,7 +239,7 @@ impl<C: CommitClient + 'static> Committer for UCCommitter<C> {
     fn commit(
         &self,
         engine: &dyn Engine,
-        actions: ScopedDeltaResultIterator<'_, FilteredEngineData>,
+        actions: DeltaResultIterator<'_, FilteredEngineData>,
         commit_metadata: CommitMetadata,
     ) -> DeltaResult<CommitResponse> {
         if commit_metadata.version() == 0 {

delta-kernel-unity-catalog/src/utils/create_table.rs

@@ -126,9 +126,7 @@ mod tests {
     use delta_kernel::snapshot::Snapshot;
     use delta_kernel::transaction::create_table::create_table;
     use delta_kernel::transaction::data_layout::DataLayout;
-    use delta_kernel::{
-        DeltaResult, Engine, FileMeta, FilteredEngineData, ScopedDeltaResultIterator,
-    };
+    use delta_kernel::{DeltaResult, DeltaResultIterator, Engine, FileMeta, FilteredEngineData};
 
     use super::*;
 
@@ -138,7 +136,7 @@ mod tests {
         fn commit(
             &self,
             engine: &dyn Engine,
-            actions: ScopedDeltaResultIterator<'_, FilteredEngineData>,
+            actions: DeltaResultIterator<'_, FilteredEngineData>,
             commit_metadata: CommitMetadata,
         ) -> DeltaResult<CommitResponse> {
             let path = commit_metadata.published_commit_path()?;

docs/user-guide/src/catalog_managed/committer.md

@@ -18,7 +18,7 @@ pub trait Committer: Send {
     fn commit(
         &self,
         engine: &dyn Engine,
-        actions: ScopedDeltaResultIterator<'_, FilteredEngineData>,
+        actions: DeltaResultIterator<'_, FilteredEngineData>,
         commit_metadata: CommitMetadata,
     ) -> DeltaResult<CommitResponse>;
 
@@ -118,7 +118,7 @@ Write the actions to a staged commit file in `_staged_commits/`:
 fn commit(
     &self,
     engine: &dyn Engine,
-    actions: ScopedDeltaResultIterator<'_, FilteredEngineData>,
+    actions: DeltaResultIterator<'_, FilteredEngineData>,
     commit_metadata: CommitMetadata,
 ) -> DeltaResult<CommitResponse> {
     // Write actions to _staged_commits/<version>.<uuid>.json. `actions` is
@@ -232,7 +232,7 @@ impl Committer for MyCatalogCommitter {
     fn commit(
         &self,
         engine: &dyn Engine,
-        actions: ScopedDeltaResultIterator<'_, FilteredEngineData>,
+        actions: DeltaResultIterator<'_, FilteredEngineData>,
         commit_metadata: CommitMetadata,
     ) -> DeltaResult<CommitResponse> {
         // 1. Stage: write actions to _staged_commits/

docs/user-guide/src/connector/implementing_engine.md

@@ -91,7 +91,7 @@ pub trait JsonHandler {
     fn write_json_file(
         &self,
         path: &Url,
-        data: ScopedDeltaResultIterator<'_, FilteredEngineData>,
+        data: DeltaResultIterator<'_, FilteredEngineData>,
         overwrite: bool,
     ) -> DeltaResult<()>;
 }
@@ -131,7 +131,7 @@ pub trait ParquetHandler {
     fn write_parquet_file(
         &self,
         location: Url,
-        data: DeltaResultIterator<Box<dyn EngineData>>,
+        data: DeltaResultIteratorStatic<Box<dyn EngineData>>,
     ) -> DeltaResult<()>;
 
     fn read_parquet_footer(&self, file: &FileMeta) -> DeltaResult<ParquetFooter>;

ffi/src/scan.rs

@@ -7,7 +7,7 @@ use std::sync::{Arc, Mutex};
 use delta_kernel::scan::state::{DvInfo, ScanFile};
 use delta_kernel::scan::{Scan, ScanBuilder, ScanMetadata};
 use delta_kernel::snapshot::SnapshotRef;
-use delta_kernel::{DeltaResult, DeltaResultIterator, Error, Expression, ExpressionRef};
+use delta_kernel::{DeltaResult, DeltaResultIteratorStatic, Error, Expression, ExpressionRef};
 use delta_kernel_ffi_macros::handle_descriptor;
 use tracing::debug;
 use url::Url;
@@ -32,7 +32,7 @@ pub struct SharedScan;
 pub struct SharedScanMetadata;
 
 /// Boxed scan metadata iterator stored behind [`ScanMetadataIterator`]'s mutex.
-type ScanMetadataIter = DeltaResultIterator<ScanMetadata>;
+type ScanMetadataIter = DeltaResultIteratorStatic<ScanMetadata>;
 
 /// An opaque, exclusive handle owning a [`ScanBuilder`].
 ///

ffi/src/table_changes.rs

@@ -7,7 +7,7 @@ use delta_kernel::arrow::ffi::to_ffi;
 use delta_kernel::engine::arrow_data::EngineDataArrowExt;
 use delta_kernel::table_changes::scan::TableChangesScan;
 use delta_kernel::table_changes::TableChanges;
-use delta_kernel::{DeltaResult, DeltaResultIterator, EngineData, Error, Version};
+use delta_kernel::{DeltaResult, DeltaResultIteratorStatic, EngineData, Error, Version};
 use delta_kernel_ffi_macros::handle_descriptor;
 use tracing::debug;
 use url::Url;
@@ -233,7 +233,7 @@ pub unsafe extern "C" fn table_changes_scan_physical_schema(
     table_changes_scan.physical_schema().clone().into()
 }
 
-type TableChangesData = Mutex<DeltaResultIterator<Box<dyn EngineData>>>;
+type TableChangesData = Mutex<DeltaResultIteratorStatic<Box<dyn EngineData>>>;
 
 pub struct ScanTableChangesIterator {
     data: TableChangesData,

kernel/src/action_reconciliation/log_replay.rs

@@ -41,7 +41,7 @@ use crate::log_replay::{
 use crate::scan::data_skipping::DataSkippingFilter;
 use crate::schema::{column_name, ColumnName, ColumnNamesAndTypes, DataType};
 use crate::utils::require;
-use crate::{DeltaResult, DeltaResultIterator, Error};
+use crate::{DeltaResult, DeltaResultIteratorStatic, Error};
 
 /// The [`ActionReconciliationProcessor`] is an implementation of the [`LogReplayProcessor`]
 /// trait that filters log segment actions.
@@ -129,13 +129,13 @@ impl ActionReconciliationIteratorState {
 /// This iterator yields a stream of [`FilteredEngineData`] items while, tracking action
 /// counts. Used by both checkpoint and log compaction workflows.
 pub struct ActionReconciliationIterator {
-    inner: DeltaResultIterator<ActionReconciliationBatch>,
+    inner: DeltaResultIteratorStatic<ActionReconciliationBatch>,
     state: Arc<ActionReconciliationIteratorState>,
 }
 
 impl ActionReconciliationIterator {
     /// Create a new iterator with counters initialized to 0
-    pub(crate) fn new(inner: DeltaResultIterator<ActionReconciliationBatch>) -> Self {
+    pub(crate) fn new(inner: DeltaResultIteratorStatic<ActionReconciliationBatch>) -> Self {
         Self {
             inner,
             state: Arc::new(ActionReconciliationIteratorState::default()),

kernel/src/checkpoint/mod.rs

@@ -125,7 +125,7 @@ use crate::snapshot::SnapshotRef;
 use crate::table_features::TableFeature;
 use crate::table_properties::TableProperties;
 use crate::{
-    DeltaResult, DeltaResultIterator, Engine, EngineData, Error, EvaluationHandlerExtension,
+    DeltaResult, DeltaResultIteratorStatic, Engine, EngineData, Error, EvaluationHandlerExtension,
     FileMeta, Version,
 };
 
@@ -663,7 +663,7 @@ impl CheckpointWriter {
 
         // Write main checkpoint file: non-file actions + sidecar references
         let checkpoint_path = self.checkpoint_path()?;
-        let main_data: DeltaResultIterator<Box<dyn EngineData>> =
+        let main_data: DeltaResultIteratorStatic<Box<dyn EngineData>> =
             Box::new(non_file_batches.into_iter().chain(sidecar_batch).map(Ok));
         engine
             .parquet_handler()

kernel/src/committer/filesystem.rs

@@ -5,7 +5,7 @@ use tracing::{info, instrument};
 use super::commit_types::{CommitMetadata, CommitResponse};
 use super::publish_types::PublishMetadata;
 use super::Committer;
-use crate::{DeltaResult, Engine, Error, FileMeta, FilteredEngineData, ScopedDeltaResultIterator};
+use crate::{DeltaResult, DeltaResultIterator, Engine, Error, FileMeta, FilteredEngineData};
 
 /// The `FileSystemCommitter` is an internal implementation of the `Committer` trait which
 /// commits to a file system directly via `Engine::json_handler().write_json_file` for
@@ -31,7 +31,7 @@ impl Committer for FileSystemCommitter {
     fn commit(
         &self,
         engine: &dyn Engine,
-        actions: ScopedDeltaResultIterator<'_, FilteredEngineData>,
+        actions: DeltaResultIterator<'_, FilteredEngineData>,
         commit_metadata: CommitMetadata,
     ) -> DeltaResult<CommitResponse> {
         let version = commit_metadata.version();

kernel/src/committer/mod.rs

@@ -34,7 +34,7 @@ pub use commit_types::{CommitMetadata, CommitResponse, CommitType};
 pub use filesystem::FileSystemCommitter;
 pub use publish_types::{CatalogCommit, PublishMetadata};
 
-use crate::{DeltaResult, Engine, FilteredEngineData, ScopedDeltaResultIterator};
+use crate::{DeltaResult, DeltaResultIterator, Engine, FilteredEngineData};
 
 /// A Committer is the system by which transactions are committed to a table. Transactions are
 /// effectively a collection of actions performed on the table at a specific version. The kernel
@@ -63,7 +63,7 @@ pub trait Committer: Send {
     fn commit(
         &self,
         engine: &dyn Engine,
-        actions: ScopedDeltaResultIterator<'_, FilteredEngineData>,
+        actions: DeltaResultIterator<'_, FilteredEngineData>,
         commit_metadata: CommitMetadata,
     ) -> DeltaResult<CommitResponse>;