diff --git a/src/mito2/src/cache/index/bloom_filter_index.rs b/src/mito2/src/cache/index/bloom_filter_index.rs index fc39192c98..707afb18a6 100644 --- a/src/mito2/src/cache/index/bloom_filter_index.rs +++ b/src/mito2/src/cache/index/bloom_filter_index.rs @@ -21,11 +21,10 @@ use async_trait::async_trait; use bytes::Bytes; use index::bloom_filter::error::Result; use index::bloom_filter::reader::{BloomFilterReadMetrics, BloomFilterReader}; -use store_api::storage::{ColumnId, FileId}; +use store_api::storage::{ColumnId, FileId, IndexVersion}; use crate::cache::index::{INDEX_METADATA_TYPE, IndexCache, PageKey}; use crate::metrics::{CACHE_HIT, CACHE_MISS}; -use crate::sst::file::IndexVersion; const INDEX_TYPE_BLOOM_FILTER_INDEX: &str = "bloom_filter_index"; diff --git a/src/mito2/src/cache/index/inverted_index.rs b/src/mito2/src/cache/index/inverted_index.rs index f99fa0218c..4c1b07126c 100644 --- a/src/mito2/src/cache/index/inverted_index.rs +++ b/src/mito2/src/cache/index/inverted_index.rs @@ -22,11 +22,10 @@ use bytes::Bytes; use index::inverted_index::error::Result; use index::inverted_index::format::reader::{InvertedIndexReadMetrics, InvertedIndexReader}; use prost::Message; -use store_api::storage::FileId; +use store_api::storage::{FileId, IndexVersion}; use crate::cache::index::{INDEX_METADATA_TYPE, IndexCache, PageKey}; use crate::metrics::{CACHE_HIT, CACHE_MISS}; -use crate::sst::file::IndexVersion; const INDEX_TYPE_INVERTED_INDEX: &str = "inverted_index"; diff --git a/src/mito2/src/sst/file.rs b/src/mito2/src/sst/file.rs index 05995123c5..8232f3c611 100644 --- a/src/mito2/src/sst/file.rs +++ b/src/mito2/src/sst/file.rs @@ -28,7 +28,7 @@ use serde::{Deserialize, Serialize}; use smallvec::SmallVec; use store_api::metadata::ColumnMetadata; use store_api::region_request::PathType; -use store_api::storage::{ColumnId, FileId, RegionId}; +use store_api::storage::{ColumnId, FileId, IndexVersion, RegionId}; use crate::access_layer::AccessLayerRef; use crate::cache::CacheManagerRef; @@ -82,8 +82,6 @@ pub type Level = u8; pub const MAX_LEVEL: Level = 2; /// Type to store index types for a column. pub type IndexTypes = SmallVec<[IndexType; 4]>; -/// Index version -pub type IndexVersion = u64; /// Cross-region file id. /// diff --git a/src/store-api/src/storage.rs b/src/store-api/src/storage.rs index 2cafaf027c..36b28b511c 100644 --- a/src/store-api/src/storage.rs +++ b/src/store-api/src/storage.rs @@ -26,6 +26,6 @@ pub use datatypes::schema::{ }; pub use self::descriptors::*; -pub use self::file::{FileId, FileRef, FileRefsManifest, GcReport, ParseIdError}; +pub use self::file::{FileId, FileRef, FileRefsManifest, GcReport, IndexVersion, ParseIdError}; pub use self::requests::{ScanRequest, TimeSeriesDistribution, TimeSeriesRowSelector}; pub use self::types::{SequenceNumber, SequenceRange}; diff --git a/src/store-api/src/storage/file.rs b/src/store-api/src/storage/file.rs index e05a818066..bb7490ccf5 100644 --- a/src/store-api/src/storage/file.rs +++ b/src/store-api/src/storage/file.rs @@ -24,6 +24,9 @@ use uuid::Uuid; use crate::ManifestVersion; use crate::storage::RegionId; +/// Index version +pub type IndexVersion = u64; + #[derive(Debug, Snafu, PartialEq)] pub struct ParseIdError { source: uuid::Error,