chore: move file iterators to fluvio_storage crate

infinyon · Oct 20, 2023 · 4a2cef3 · 4a2cef3
1 parent bf4e866
commit 4a2cef3
Show file tree

Hide file tree

Showing 11 changed files with 352 additions and 355 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/fluvio-spu/Cargo.toml b/crates/fluvio-spu/Cargo.toml
@@ -51,7 +51,7 @@ chrono = { workspace = true }
 # Fluvio dependencies
 fluvio = { workspace = true }
 fluvio-types = { workspace = true, features = ["events"] }
-fluvio-storage = { workspace = true }
+fluvio-storage = { workspace = true, features = ["iterators"] }
 fluvio-compression = { workspace = true }
 fluvio-controlplane = { workspace = true }
 fluvio-controlplane-metadata = { workspace = true }

diff --git a/crates/fluvio-spu/src/services/public/stream_fetch.rs b/crates/fluvio-spu/src/services/public/stream_fetch.rs
@@ -1,6 +1,7 @@
 use std::sync::Arc;
 use std::time::Instant;
 
+use fluvio_storage::iterators::FileBatchIterator;
 use tracing::{debug, error, instrument, trace, warn};
 use tokio::select;
 
@@ -31,7 +32,6 @@ use crate::services::public::conn_context::ConnectionContext;
 use crate::services::public::stream_fetch::publishers::INIT_OFFSET;
 use crate::smartengine::context::SmartModuleContext;
 use crate::smartengine::batch::process_batch;
-use crate::smartengine::file_batch::FileBatchIterator;
 use crate::core::metrics::SpuMetrics;
 use crate::traffic::TrafficType;
 

diff --git a/crates/fluvio-spu/src/services/public/tests/produce.rs b/crates/fluvio-spu/src/services/public/tests/produce.rs
@@ -3,7 +3,7 @@ use std::{env::temp_dir, time::Duration};
 use fluvio::{SmartModuleInvocation, SmartModuleInvocationWasm, SmartModuleKind};
 use fluvio_controlplane::replica::Replica;
 use fluvio_smartmodule::{Record, dataplane::smartmodule::Lookback};
-use fluvio_storage::FileReplica;
+use fluvio_storage::{FileReplica, iterators::FileBatchIterator};
 use tracing::debug;
 
 use fluvio_protocol::{
@@ -34,7 +34,6 @@ use crate::{
         },
     },
     replication::leader::LeaderReplicaState,
-    smartengine::file_batch::FileBatchIterator,
 };
 
 #[fluvio_future::test(ignore)]

diff --git a/crates/fluvio-spu/src/smartengine/context.rs b/crates/fluvio-spu/src/smartengine/context.rs
@@ -7,6 +7,7 @@ use fluvio_protocol::link::ErrorCode;
 use fluvio_smartmodule::Record;
 use fluvio_spu_schema::server::smartmodule::{SmartModuleInvocation, SmartModuleInvocationWasm};
 use fluvio_storage::ReplicaStorage;
+use fluvio_storage::iterators::{FileBatch, FileBatchIterator, FileRecordIterator, RecordItem};
 use fluvio_types::Timestamp;
 use tracing::{debug, trace, error};
 
@@ -15,14 +16,11 @@ use crate::core::metrics::SpuMetrics;
 use crate::replication::leader::LeaderReplicaState;
 
 use crate::smartengine::chain;
-use crate::smartengine::file_batch::{FileRecordIterator, FileBatchIterator};
 use crate::smartengine::Lookback;
 use crate::smartengine::SmartModuleChainBuilder;
 use crate::smartengine::SmartModuleChainInstance;
 use crate::smartengine::Version;
 
-use super::file_batch::{FileBatch, RecordItem};
-
 #[derive(Debug)]
 pub struct SmartModuleContext {
     chain: SmartModuleChainInstance,