From 2b7005ad490dfbfaac6d856fe66aa6b99f4e93b2 Mon Sep 17 00:00:00 2001 From: weisd Date: Thu, 4 Jul 2024 17:30:16 +0800 Subject: [PATCH] test:FileMeta --- ecstore/src/sets.rs | 2 +- ecstore/src/store_api.rs | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ecstore/src/sets.rs b/ecstore/src/sets.rs index d7d1cd20..4096b6eb 100644 --- a/ecstore/src/sets.rs +++ b/ecstore/src/sets.rs @@ -172,7 +172,7 @@ impl StorageAPI for Sets { let mut fi = FileInfo::new([bucket, object].join("/").as_str(), data_drives, parity_drives); - fi.data_dir = Uuid::new_v4().to_string(); + fi.data_dir = Uuid::new_v4(); let parts_metadata = vec![fi.clone(); disks.len()]; diff --git a/ecstore/src/store_api.rs b/ecstore/src/store_api.rs index e488db4d..2b400783 100644 --- a/ecstore/src/store_api.rs +++ b/ecstore/src/store_api.rs @@ -6,17 +6,20 @@ use futures::Stream; use s3s::{dto::StreamingBlob, Body}; use time::OffsetDateTime; use tracing::debug; +use uuid::Uuid; pub const ERASURE_ALGORITHM: &str = "rs-vandermonde"; pub const BLOCK_SIZE_V2: usize = 1048576; // 1M #[derive(Debug, Clone)] pub struct FileInfo { + pub version_id: Uuid, pub erasure: ErasureInfo, pub deleted: bool, // DataDir of the file - pub data_dir: String, + pub data_dir: Uuid, pub mod_time: OffsetDateTime, + pub size: usize, } impl FileInfo { @@ -29,10 +32,12 @@ impl FileInfo { impl Default for FileInfo { fn default() -> Self { Self { + version_id: Uuid::nil(), erasure: Default::default(), deleted: Default::default(), - data_dir: Default::default(), + data_dir: Uuid::nil(), mod_time: OffsetDateTime::UNIX_EPOCH, + size: Default::default(), } } }