refactor: move Sequence to data_types (#2780)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

Cargo.lock

@@ -2802,7 +2802,6 @@ version = "0.1.0"
 dependencies = [
  "chrono",
  "data_types",
- "entry",
  "internal_types",
  "observability_deps",
  "snafu",

data_types/src/lib.rs

@@ -19,6 +19,7 @@ pub mod error;
 pub mod job;
 pub mod names;
 pub mod partition_metadata;
+pub mod sequence;
 pub mod server_id;
 pub mod timestamp;
 pub mod write_summary;

data_types/src/sequence.rs

@@ -0,0 +1,14 @@
+#[derive(Debug, Copy, Clone)]
+pub struct Sequence {
+    pub id: u32,
+    pub number: u64,
+}
+
+impl Sequence {
+    pub fn new(sequencer_id: u32, sequence_number: u64) -> Self {
+        Self {
+            id: sequencer_id,
+            number: sequence_number,
+        }
+    }
+}

entry/src/entry.rs

@@ -9,6 +9,8 @@ use ouroboros::self_referencing;
 use snafu::{OptionExt, ResultExt, Snafu};
 
 use data_types::database_rules::{Error as DataError, Partitioner, ShardId, Sharder};
+use data_types::sequence::Sequence;
+use data_types::write_summary::TimestampSummary;
 use generated_types::influxdata::pbdata::v1 as pb;
 use influxdb_line_protocol::{FieldValue, ParsedLine};
 use internal_types::schema::{
@@ -17,7 +19,6 @@ use internal_types::schema::{
 };
 
 use crate::entry_fb;
-use data_types::write_summary::TimestampSummary;
 
 #[derive(Debug, Snafu)]
 pub enum Error {
@@ -1750,21 +1751,6 @@ pub struct SequencedEntry {
     sequence_and_producer_ts: Option<(Sequence, DateTime<Utc>)>,
 }
 
-#[derive(Debug, Copy, Clone)]
-pub struct Sequence {
-    pub id: u32,
-    pub number: u64,
-}
-
-impl Sequence {
-    pub fn new(sequencer_id: u32, sequence_number: u64) -> Self {
-        Self {
-            id: sequencer_id,
-            number: sequence_number,
-        }
-    }
-}
-
 impl SequencedEntry {
     pub fn new_from_sequence(
         sequence: Sequence,

persistence_windows/Cargo.toml

@@ -6,7 +6,6 @@ edition = "2018"
 [dependencies]
 chrono = "0.4"
 data_types = { path = "../data_types" }
-entry = { path = "../entry" }
 internal_types = { path = "../internal_types" }
 observability_deps = { path = "../observability_deps" }
 snafu = "0.6.2"

persistence_windows/src/persistence_windows.rs

@@ -9,8 +9,9 @@ use std::{
 
 use chrono::{DateTime, Duration, Utc};
 
-use data_types::{partition_metadata::PartitionAddr, write_summary::WriteSummary};
-use entry::Sequence;
+use data_types::{
+    partition_metadata::PartitionAddr, sequence::Sequence, write_summary::WriteSummary,
+};
 use internal_types::freezable::{Freezable, FreezeHandle};
 
 use crate::min_max_sequence::MinMaxSequence;

server/src/database.rs

@@ -1194,7 +1194,8 @@ mod tests {
     use data_types::database_rules::{
         PartitionTemplate, TemplatePart, WriteBufferConnection, WriteBufferDirection,
     };
-    use entry::{test_helpers::lp_to_entries, Sequence, SequencedEntry};
+    use data_types::sequence::Sequence;
+    use entry::{test_helpers::lp_to_entries, SequencedEntry};
     use object_store::ObjectStore;
     use std::{
         convert::{TryFrom, TryInto},

server/src/db.rs

@@ -24,10 +24,11 @@ use data_types::{
     chunk_metadata::{ChunkId, ChunkLifecycleAction, ChunkOrder, ChunkSummary},
     database_rules::DatabaseRules,
     partition_metadata::{PartitionSummary, TableSummary},
+    sequence::Sequence,
     server_id::ServerId,
 };
 use datafusion::catalog::{catalog::CatalogProvider, schema::SchemaProvider};
-use entry::{Entry, Sequence, SequencedEntry, TableBatch};
+use entry::{Entry, SequencedEntry, TableBatch};
 use internal_types::schema::Schema;
 use iox_object_store::IoxObjectStore;
 use mutable_buffer::chunk::{ChunkMetrics as MutableBufferChunkMetrics, MBChunk};

server/src/db/replay.rs

@@ -5,7 +5,8 @@ use std::{
 };
 
 use chrono::Utc;
-use entry::{Sequence, TableBatch};
+use data_types::sequence::Sequence;
+use entry::TableBatch;
 use futures::TryStreamExt;
 use observability_deps::tracing::info;
 use persistence_windows::{
@@ -420,11 +421,12 @@ mod tests {
     use chrono::{DateTime, Utc};
     use data_types::{
         database_rules::{PartitionTemplate, Partitioner, TemplatePart},
+        sequence::Sequence,
         server_id::ServerId,
     };
     use entry::{
         test_helpers::{lp_to_entries, lp_to_entry},
-        Sequence, SequencedEntry,
+        SequencedEntry,
     };
     use object_store::ObjectStore;
     use persistence_windows::{

server/src/write_buffer.rs

@@ -201,8 +201,8 @@ mod tests {
     use ::test_helpers::assert_contains;
     use arrow_util::assert_batches_eq;
     use data_types::database_rules::{PartitionTemplate, TemplatePart};
+    use data_types::sequence::Sequence;
     use entry::test_helpers::lp_to_entry;
-    use entry::Sequence;
     use persistence_windows::min_max_sequence::MinMaxSequence;
     use query::exec::ExecutionContextProvider;
     use query::frontend::sql::SqlQueryPlanner;

write_buffer/src/core.rs

@@ -2,7 +2,8 @@ use std::fmt::Debug;
 
 use async_trait::async_trait;
 use chrono::{DateTime, Utc};
-use entry::{Entry, Sequence, SequencedEntry};
+use data_types::sequence::Sequence;
+use entry::{Entry, SequencedEntry};
 use futures::{future::BoxFuture, stream::BoxStream};
 
 /// Generic boxed error type that is used in this crate.

write_buffer/src/kafka.rs

@@ -8,8 +8,10 @@ use std::{
 
 use async_trait::async_trait;
 use chrono::{DateTime, TimeZone, Utc};
-use data_types::{database_rules::WriteBufferCreationConfig, server_id::ServerId};
-use entry::{Entry, Sequence, SequencedEntry};
+use data_types::{
+    database_rules::WriteBufferCreationConfig, sequence::Sequence, server_id::ServerId,
+};
+use entry::{Entry, SequencedEntry};
 use futures::{FutureExt, StreamExt};
 use observability_deps::tracing::{debug, info};
 use rdkafka::{

write_buffer/src/mock.rs

@@ -11,7 +11,8 @@ use futures::{stream, FutureExt, StreamExt};
 use parking_lot::Mutex;
 
 use data_types::database_rules::WriteBufferCreationConfig;
-use entry::{Entry, Sequence, SequencedEntry};
+use data_types::sequence::Sequence;
+use entry::{Entry, SequencedEntry};
 
 use crate::core::{
     EntryStream, FetchHighWatermark, FetchHighWatermarkFut, WriteBufferError, WriteBufferReading,