Merge pull request #6193 from influxdata/dom/move-sequence-range

refactor: move SequenceNumberRange

ingester/src/data.rs

@@ -32,12 +32,9 @@ use write_summary::ShardProgress;
 
 pub(crate) mod namespace;
 pub mod partition;
-mod sequence_range;
 pub(crate) mod shard;
 pub(crate) mod table;
 
-pub(crate) use sequence_range::*;
-
 use self::{
     namespace::name_resolver::{NamespaceNameProvider, NamespaceNameResolver},
     partition::resolver::{CatalogPartitionResolver, PartitionCache, PartitionProvider},

ingester/src/data/partition.rs

@@ -10,9 +10,11 @@ use thiserror::Error;
 use write_summary::ShardProgress;
 
 use self::buffer::{traits::Queryable, BufferState, DataBuffer, Persisting};
-use crate::{deferred_load::DeferredLoad, query_adaptor::QueryAdaptor};
+use crate::{
+    deferred_load::DeferredLoad, query_adaptor::QueryAdaptor, sequence_range::SequenceNumberRange,
+};
 
-use super::{sequence_range::SequenceNumberRange, table::TableName};
+use super::table::TableName;
 
 mod buffer;
 pub mod resolver;

ingester/src/data/partition/buffer.rs

@@ -4,8 +4,6 @@ use arrow::record_batch::RecordBatch;
 use data_types::SequenceNumber;
 use mutable_batch::MutableBatch;
 
-use crate::data::SequenceNumberRange;
-
 mod always_some;
 mod mutable_buffer;
 mod state_machine;
@@ -13,6 +11,8 @@ pub(crate) mod traits;
 
 pub(crate) use state_machine::*;
 
+use crate::sequence_range::SequenceNumberRange;
+
 use self::{always_some::AlwaysSome, traits::Queryable};
 
 /// The current state of the [`BufferState`] state machine.

ingester/src/data/partition/buffer/state_machine.rs

@@ -12,7 +12,7 @@ mod snapshot;
 pub(in crate::data::partition::buffer) use buffering::*;
 pub(crate) use persisting::*;
 
-use crate::data::SequenceNumberRange;
+use crate::sequence_range::SequenceNumberRange;
 
 use super::traits::{Queryable, Writeable};
 

ingester/src/lib.rs

@@ -28,6 +28,7 @@ pub mod lifecycle;
 mod poison;
 pub mod querier_handler;
 pub(crate) mod query_adaptor;
+mod sequence_range;
 pub mod server;
 pub(crate) mod stream_handler;
 #[cfg(test)]