fix: 调整disk trait位置

ecstore/src/disk/local.rs

@@ -1,4 +1,7 @@
 use super::{error::DiskError, format::FormatV3};
+use super::{
+    DeleteOptions, DiskAPI, FileReader, FileWriter, ReadMultipleReq, ReadMultipleResp, ReadOptions, RenameDataResp, VolumeInfo,
+};
 use bytes::Bytes;
 use futures::future::join_all;
 use path_absolutize::Absolutize;
@@ -14,10 +17,6 @@ use tracing::{debug, warn};
 use uuid::Uuid;
 
 use crate::{
-    disk_api::{
-        DeleteOptions, DiskAPI, FileReader, FileWriter, ReadMultipleReq, ReadMultipleResp, ReadOptions, RenameDataResp,
-        VolumeInfo,
-    },
     endpoint::{Endpoint, Endpoints},
     error::{Error, Result},
     file_meta::FileMeta,

ecstore/src/disk/mod.rs

@@ -11,3 +11,179 @@ pub const RUSTFS_META_TMP_DELETED_BUCKET: &str = ".rustfs.sys/tmp/.trash";
 pub const BUCKET_META_PREFIX: &str = "buckets";
 pub const FORMAT_CONFIG_FILE: &str = "format.json";
 const STORAGE_FORMAT_FILE: &str = "xl.meta";
+
+use crate::{
+    erasure::ReadAt,
+    error::Result,
+    store_api::{FileInfo, RawFileInfo},
+};
+use bytes::Bytes;
+use std::{fmt::Debug, io::SeekFrom, pin::Pin};
+use time::OffsetDateTime;
+use tokio::{
+    fs::File,
+    io::{AsyncReadExt, AsyncSeekExt, AsyncWrite},
+};
+use uuid::Uuid;
+
+#[async_trait::async_trait]
+pub trait DiskAPI: Debug + Send + Sync + 'static {
+    fn is_local(&self) -> bool;
+    fn id(&self) -> Uuid;
+
+    async fn delete(&self, volume: &str, path: &str, opt: DeleteOptions) -> Result<()>;
+    async fn read_all(&self, volume: &str, path: &str) -> Result<Bytes>;
+    async fn write_all(&self, volume: &str, path: &str, data: Vec<u8>) -> Result<()>;
+    async fn rename_file(&self, src_volume: &str, src_path: &str, dst_volume: &str, dst_path: &str) -> Result<()>;
+    async fn create_file(&self, origvolume: &str, volume: &str, path: &str, file_size: usize) -> Result<FileWriter>;
+    async fn append_file(&self, volume: &str, path: &str) -> Result<FileWriter>;
+    async fn read_file(&self, volume: &str, path: &str) -> Result<FileReader>;
+    // 读目录下的所有文件、目录
+    async fn list_dir(&self, origvolume: &str, volume: &str, dir_path: &str, count: usize) -> Result<Vec<String>>;
+    // 读目录下的所有xl.meta
+    async fn walk_dir(&self) -> Result<Vec<FileInfo>>;
+    async fn rename_data(
+        &self,
+        src_volume: &str,
+        src_path: &str,
+        file_info: FileInfo,
+        dst_volume: &str,
+        dst_path: &str,
+    ) -> Result<RenameDataResp>;
+
+    async fn make_volumes(&self, volume: Vec<&str>) -> Result<()>;
+    async fn delete_volume(&self, volume: &str) -> Result<()>;
+    async fn list_volumes(&self) -> Result<Vec<VolumeInfo>>;
+    async fn make_volume(&self, volume: &str) -> Result<()>;
+    async fn stat_volume(&self, volume: &str) -> Result<VolumeInfo>;
+
+    async fn write_metadata(&self, org_volume: &str, volume: &str, path: &str, fi: FileInfo) -> Result<()>;
+    async fn read_version(
+        &self,
+        org_volume: &str,
+        volume: &str,
+        path: &str,
+        version_id: &str,
+        opts: &ReadOptions,
+    ) -> Result<FileInfo>;
+    async fn read_xl(&self, volume: &str, path: &str, read_data: bool) -> Result<RawFileInfo>;
+    async fn read_multiple(&self, req: ReadMultipleReq) -> Result<Vec<ReadMultipleResp>>;
+}
+
+pub struct RenameDataResp {
+    pub old_data_dir: String,
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct DeleteOptions {
+    pub recursive: bool,
+    pub immediate: bool,
+}
+
+#[derive(Debug, Clone)]
+pub struct ReadMultipleReq {
+    pub bucket: String,
+    pub prefix: String,
+    pub files: Vec<String>,
+    pub max_size: usize,
+    pub metadata_only: bool,
+    pub abort404: bool,
+    pub max_results: usize,
+}
+
+#[derive(Debug, Clone)]
+pub struct ReadMultipleResp {
+    pub bucket: String,
+    pub prefix: String,
+    pub file: String,
+    pub exists: bool,
+    pub error: String,
+    pub data: Vec<u8>,
+    pub mod_time: OffsetDateTime,
+}
+
+impl Default for ReadMultipleResp {
+    fn default() -> Self {
+        Self {
+            bucket: String::new(),
+            prefix: String::new(),
+            file: String::new(),
+            exists: false,
+            error: String::new(),
+            data: Vec::new(),
+            mod_time: OffsetDateTime::UNIX_EPOCH,
+        }
+    }
+}
+
+pub struct VolumeInfo {
+    pub name: String,
+    pub created: OffsetDateTime,
+}
+
+pub struct ReadOptions {
+    pub read_data: bool,
+    pub healing: bool,
+}
+
+pub struct FileWriter {
+    pub inner: Pin<Box<dyn AsyncWrite + Send + Sync + 'static>>,
+}
+
+impl AsyncWrite for FileWriter {
+    fn poll_write(
+        mut self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        buf: &[u8],
+    ) -> std::task::Poll<std::result::Result<usize, std::io::Error>> {
+        Pin::new(&mut self.inner).poll_write(cx, buf)
+    }
+
+    fn poll_flush(
+        mut self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<std::result::Result<(), std::io::Error>> {
+        Pin::new(&mut self.inner).poll_flush(cx)
+    }
+
+    fn poll_shutdown(
+        mut self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<std::result::Result<(), std::io::Error>> {
+        Pin::new(&mut self.inner).poll_shutdown(cx)
+    }
+}
+
+impl FileWriter {
+    pub fn new<W>(inner: W) -> Self
+    where
+        W: AsyncWrite + Send + Sync + 'static,
+    {
+        Self { inner: Box::pin(inner) }
+    }
+}
+
+#[derive(Debug)]
+pub struct FileReader {
+    pub inner: File,
+}
+
+impl FileReader {
+    pub fn new(inner: File) -> Self {
+        Self { inner }
+    }
+}
+
+impl ReadAt for FileReader {
+    async fn read_at(&mut self, offset: usize, length: usize) -> Result<(Vec<u8>, usize)> {
+        self.inner.seek(SeekFrom::Start(offset as u64)).await?;
+
+        let mut buffer = vec![0; length];
+
+        let bytes_read = self.inner.read(&mut buffer).await?;
+
+        buffer.truncate(bytes_read);
+
+        Ok((buffer, bytes_read))
+    }
+}

ecstore/src/disk_api.rs

@@ -1,177 +0,0 @@
-use std::{fmt::Debug, io::SeekFrom, pin::Pin};
-
-use bytes::Bytes;
-use time::OffsetDateTime;
-use tokio::{
-    fs::File,
-    io::{AsyncReadExt, AsyncSeekExt, AsyncWrite},
-};
-use uuid::Uuid;
-
-use crate::{
-    erasure::ReadAt,
-    error::Result,
-    store_api::{FileInfo, RawFileInfo},
-};
-
-#[async_trait::async_trait]
-pub trait DiskAPI: Debug + Send + Sync + 'static {
-    fn is_local(&self) -> bool;
-    fn id(&self) -> Uuid;
-
-    async fn delete(&self, volume: &str, path: &str, opt: DeleteOptions) -> Result<()>;
-    async fn read_all(&self, volume: &str, path: &str) -> Result<Bytes>;
-    async fn write_all(&self, volume: &str, path: &str, data: Vec<u8>) -> Result<()>;
-    async fn rename_file(&self, src_volume: &str, src_path: &str, dst_volume: &str, dst_path: &str) -> Result<()>;
-    async fn create_file(&self, origvolume: &str, volume: &str, path: &str, file_size: usize) -> Result<FileWriter>;
-    async fn append_file(&self, volume: &str, path: &str) -> Result<FileWriter>;
-    async fn read_file(&self, volume: &str, path: &str) -> Result<FileReader>;
-    // 读目录下的所有文件、目录
-    async fn list_dir(&self, origvolume: &str, volume: &str, dir_path: &str, count: usize) -> Result<Vec<String>>;
-    // 读目录下的所有xl.meta
-    async fn walk_dir(&self) -> Result<Vec<FileInfo>>;
-    async fn rename_data(
-        &self,
-        src_volume: &str,
-        src_path: &str,
-        file_info: FileInfo,
-        dst_volume: &str,
-        dst_path: &str,
-    ) -> Result<RenameDataResp>;
-
-    async fn make_volumes(&self, volume: Vec<&str>) -> Result<()>;
-    async fn delete_volume(&self, volume: &str) -> Result<()>;
-    async fn list_volumes(&self) -> Result<Vec<VolumeInfo>>;
-    async fn make_volume(&self, volume: &str) -> Result<()>;
-    async fn stat_volume(&self, volume: &str) -> Result<VolumeInfo>;
-
-    async fn write_metadata(&self, org_volume: &str, volume: &str, path: &str, fi: FileInfo) -> Result<()>;
-    async fn read_version(
-        &self,
-        org_volume: &str,
-        volume: &str,
-        path: &str,
-        version_id: &str,
-        opts: &ReadOptions,
-    ) -> Result<FileInfo>;
-    async fn read_xl(&self, volume: &str, path: &str, read_data: bool) -> Result<RawFileInfo>;
-    async fn read_multiple(&self, req: ReadMultipleReq) -> Result<Vec<ReadMultipleResp>>;
-}
-
-pub struct RenameDataResp {
-    pub old_data_dir: String,
-}
-
-#[derive(Debug, Clone, Default)]
-pub struct DeleteOptions {
-    pub recursive: bool,
-    pub immediate: bool,
-}
-
-#[derive(Debug, Clone)]
-pub struct ReadMultipleReq {
-    pub bucket: String,
-    pub prefix: String,
-    pub files: Vec<String>,
-    pub max_size: usize,
-    pub metadata_only: bool,
-    pub abort404: bool,
-    pub max_results: usize,
-}
-
-#[derive(Debug, Clone)]
-pub struct ReadMultipleResp {
-    pub bucket: String,
-    pub prefix: String,
-    pub file: String,
-    pub exists: bool,
-    pub error: String,
-    pub data: Vec<u8>,
-    pub mod_time: OffsetDateTime,
-}
-
-impl Default for ReadMultipleResp {
-    fn default() -> Self {
-        Self {
-            bucket: Default::default(),
-            prefix: Default::default(),
-            file: Default::default(),
-            exists: Default::default(),
-            error: Default::default(),
-            data: Default::default(),
-            mod_time: OffsetDateTime::UNIX_EPOCH,
-        }
-    }
-}
-
-pub struct VolumeInfo {
-    pub name: String,
-    pub created: OffsetDateTime,
-}
-
-pub struct ReadOptions {
-    pub read_data: bool,
-    pub healing: bool,
-}
-
-pub struct FileWriter {
-    pub inner: Pin<Box<dyn AsyncWrite + Send + Sync + 'static>>,
-}
-
-impl AsyncWrite for FileWriter {
-    fn poll_write(
-        mut self: Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-        buf: &[u8],
-    ) -> std::task::Poll<std::result::Result<usize, std::io::Error>> {
-        Pin::new(&mut self.inner).poll_write(cx, buf)
-    }
-
-    fn poll_flush(
-        mut self: Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<std::result::Result<(), std::io::Error>> {
-        Pin::new(&mut self.inner).poll_flush(cx)
-    }
-
-    fn poll_shutdown(
-        mut self: Pin<&mut Self>,
-        cx: &mut std::task::Context<'_>,
-    ) -> std::task::Poll<std::result::Result<(), std::io::Error>> {
-        Pin::new(&mut self.inner).poll_shutdown(cx)
-    }
-}
-
-impl FileWriter {
-    pub fn new<W>(inner: W) -> Self
-    where
-        W: AsyncWrite + Send + Sync + 'static,
-    {
-        Self { inner: Box::pin(inner) }
-    }
-}
-
-#[derive(Debug)]
-pub struct FileReader {
-    pub inner: File,
-}
-
-impl FileReader {
-    pub fn new(inner: File) -> Self {
-        Self { inner }
-    }
-}
-
-impl ReadAt for FileReader {
-    async fn read_at(&mut self, offset: usize, length: usize) -> Result<(Vec<u8>, usize)> {
-        self.inner.seek(SeekFrom::Start(offset as u64)).await?;
-
-        let mut buffer = vec![0; length];
-
-        let bytes_read = self.inner.read(&mut buffer).await?;
-
-        buffer.truncate(bytes_read);
-
-        Ok((buffer, bytes_read))
-    }
-}

ecstore/src/erasure.rs

@@ -13,7 +13,7 @@ use uuid::Uuid;
 
 use crate::chunk_stream::ChunkedStream;
 use crate::disk::error::DiskError;
-use crate::disk_api::FileReader;
+use crate::disk::FileReader;
 
 pub struct Erasure {
     data_shards: usize,

ecstore/src/lib.rs

@@ -1,7 +1,6 @@
 mod bucket_meta;
 mod chunk_stream;
 pub mod disk;
-pub mod disk_api;
 mod disks_layout;
 mod endpoint;
 mod erasure;

ecstore/src/peer.rs

@@ -4,8 +4,8 @@ use std::{collections::HashMap, fmt::Debug, sync::Arc};
 use tracing::warn;
 
 use crate::{
+    disk::VolumeInfo,
     disk::{error::DiskError, DiskStore},
-    disk_api::VolumeInfo,
     endpoint::{EndpointServerPools, Node},
     error::{Error, Result},
     store_api::{BucketInfo, BucketOptions, MakeBucketOptions},