fix: 调整cargo引用 & Endpoint修改

Cargo.toml

@@ -19,3 +19,4 @@ thiserror = "1.0.61"
 time = "0.3.36"
 async-trait = "0.1.80"
 tokio = "1.38.0"
+anyhow ="1.0.86"

ecstore/Cargo.toml

@@ -9,19 +9,23 @@ rust-version.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+bytes.workspace = true
+thiserror.workspace = true
+futures.workspace = true
+async-trait.workspace = true
+tracing.workspace = true
+serde.workspace = true
+anyhow.workspace = true
+tokio = { workspace = true, futures = ["fs", "rt", "macros"] }
+
 url = "2.5.2"
 uuid = "1.8.0"
 reed-solomon-erasure = "6.0.0"
 transform-stream = "0.3.0"
-bytes.workspace = true
-tokio.workspace = true
-thiserror.workspace = true
-futures.workspace = true
-anyhow = "1.0.86"
-serde.workspace = true
 lazy_static = "1.5.0"
 regex = "1.10.5"
 netif = "0.1.6"
-async-trait = "0.1.80"
-tracing.workspace = true
 tracing-error = "0.2.0"
+
+[dev-dependencies]
+tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

ecstore/src/endpoint.rs

@@ -1,31 +1,30 @@
-use std::{collections::HashMap, net::IpAddr, path::Path, usize};
-
 use super::disks_layout::PoolDisksLayout;
 use super::utils::{
     net::{is_local_host, split_host_port},
     string::new_string_set,
 };
 use anyhow::Error;
-use url::Url;
+use std::fmt::Display;
+use std::{collections::HashMap, net::IpAddr, path::Path, usize};
+use url::{ParseError, Url};
 
 pub const DEFAULT_PORT: u16 = 9000;
 
-// #[derive(Debug, Clone)]
+/// enum for endpoint type.
-// struct Node {
-//     url: url::Url,
-//     pools: Vec<usize>,
-//     is_local: bool,
-//     grid_host: String,
-// }
-
 #[derive(PartialEq, Eq)]
 pub enum EndpointType {
-    Undefiend,
+    /// path style endpoint type enum.
-    PathEndpointType,
+    Path,
-    URLEndpointType,
+
+    /// URL style endpoint type enum.
+    Url,
+
+    /// Unknown endpoint type enum.
+    UnKnow,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Ord)]
+/// holds information about a node in this cluster
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Node {
     pub url: url::Url,
     pub pools: Vec<i32>,
@@ -33,24 +32,57 @@ pub struct Node {
     pub grid_host: String, // TODO "scheme://host:port"
 }
 
-impl PartialOrd for Node {
+// impl PartialOrd for Node {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+//     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.grid_host.partial_cmp(&other.grid_host)
+//         self.grid_host.partial_cmp(&other.grid_host)
-    }
+//     }
-}
+// }
 
+/// any type of endpoint.
 #[derive(Debug, Clone)]
 pub struct Endpoint {
     pub url: url::Url,
     pub is_local: bool,
+
     pub pool_idx: i32,
     pub set_idx: i32,
     pub disk_idx: i32,
 }
 
-// 检查给定路径是否为空或根路径
+impl Display for Endpoint {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        if self.url.has_host() {
+            write!(f, "{}", self.url)
+        } else {
+            write!(f, "{}", self.url.path())
+        }
+    }
+}
+
+impl TryFrom<&str> for Endpoint {
+    /// The type returned in the event of a conversion error.
+    type Error = String;
+
+    /// Performs the conversion.
+    fn try_from(value: &str) -> Result<Self, Self::Error> {
+        if is_empty_path(value) {
+            return Err("empty or root endpoint is not supported".into());
+        }
+
+        // match Url::parse(value) {
+        //     Ok(u) => u,
+        //     Err(e) => match e {
+        //         ParseError::EmptyHost => Err("")
+        //     },
+        // }
+
+        unimplemented!()
+    }
+}
+
+/// check whether given path is not empty.
 fn is_empty_path(path: &str) -> bool {
-    path == "" || path == "/" || path == "\\"
+    ["", "/", "\\"].iter().any(|&v| v.eq(path))
 }
 
 // 检查给定字符串是否是IP地址
@@ -58,14 +90,6 @@ fn is_host_ip(ip_str: &str) -> bool {
     ip_str.parse::<IpAddr>().is_ok()
 }
 
-#[tokio::test]
-async fn test_new_endpont() {
-    let arg = "./data";
-    let ep = Endpoint::new(arg).unwrap();
-
-    println!("{:?}", ep);
-}
-
 impl Endpoint {
     fn new(arg: &str) -> Result<Self, Error> {
         if is_empty_path(arg) {
@@ -73,16 +97,16 @@ impl Endpoint {
         }
 
         let url = Url::parse(arg).or_else(|e| match e {
-            url::ParseError::EmptyHost => Err(Error::msg("远程地址，域名不能为空")),
+            ParseError::EmptyHost => Err(Error::msg("远程地址，域名不能为空")),
-            url::ParseError::IdnaError => Err(Error::msg("域名格式不正确")),
+            ParseError::IdnaError => Err(Error::msg("域名格式不正确")),
-            url::ParseError::InvalidPort => Err(Error::msg("端口格式不正确")),
+            ParseError::InvalidPort => Err(Error::msg("端口格式不正确")),
-            url::ParseError::InvalidIpv4Address => Err(Error::msg("IP格式不正确")),
+            ParseError::InvalidIpv4Address => Err(Error::msg("IP格式不正确")),
-            url::ParseError::InvalidIpv6Address => Err(Error::msg("IP格式不正确")),
+            ParseError::InvalidIpv6Address => Err(Error::msg("IP格式不正确")),
-            url::ParseError::InvalidDomainCharacter => Err(Error::msg("域名字符格式不正确")),
+            ParseError::InvalidDomainCharacter => Err(Error::msg("域名字符格式不正确")),
             // url::ParseError::RelativeUrlWithoutBase => todo!(),
             // url::ParseError::RelativeUrlWithCannotBeABaseBase => todo!(),
             // url::ParseError::SetHostOnCannotBeABaseUrl => todo!(),
-            url::ParseError::Overflow => Err(Error::msg("长度过长")),
+            ParseError::Overflow => Err(Error::msg("长度过长")),
             _ => {
                 if is_host_ip(arg) {
                     return Err(Error::msg("无效的URL endpoint格式: 缺少 http 或 https"));
@@ -160,15 +184,11 @@ impl Endpoint {
     // }
 
     pub fn get_type(&self) -> EndpointType {
-        if self.url.scheme() == "file" {
+        if self.url.has_host() {
-            return EndpointType::PathEndpointType;
+            EndpointType::Url
+        } else {
+            EndpointType::Path
         }
-
-        EndpointType::URLEndpointType
-    }
-
-    pub fn to_string(&self) -> String {
-        self.url.as_str().to_string()
     }
 
     // pub fn get_scheme(&self) -> String {
@@ -230,7 +250,7 @@ impl Endpoints {
         self.0.as_slice()[start..end].to_vec()
     }
     pub fn from_args(args: Vec<String>) -> Result<Self, Error> {
-        let mut ep_type = EndpointType::Undefiend;
+        let mut ep_type = EndpointType::UnKnow;
         let mut scheme = String::new();
         let mut eps = Vec::new();
         let mut uniq_args = new_string_set();
@@ -365,7 +385,7 @@ impl EndpointServerPools {
 
         let mut nodes: Vec<Node> = node_map.into_iter().map(|(_, n)| n).collect();
 
-        nodes.sort_by(|a, b| a.cmp(b));
+        // nodes.sort_by(|a, b| a.cmp(b));
 
         nodes
     }
@@ -429,7 +449,7 @@ pub fn create_pool_endpoints(
         let mut endpoint = Endpoint::new(pools[0].layout[0][0].as_str())?;
         endpoint.update_islocal()?;
 
-        if endpoint.get_type() != EndpointType::PathEndpointType {
+        if endpoint.get_type() != EndpointType::Path {
             return Err(Error::msg("use path style endpoint for single node setup"));
         }
 
@@ -493,12 +513,12 @@ pub fn create_pool_endpoints(
     let erasure_type = uniq_host.to_slice().len() == 1;
 
     for eps in ret.iter() {
-        if eps.0[0].get_type() == EndpointType::PathEndpointType {
+        if eps.0[0].get_type() == EndpointType::Path {
             setup_type = SetupType::ErasureSetupType;
             break;
         }
 
-        if eps.0[0].get_type() == EndpointType::URLEndpointType {
+        if eps.0[0].get_type() == EndpointType::Url {
             if erasure_type {
                 setup_type = SetupType::ErasureSetupType;
             } else {
@@ -549,6 +569,23 @@ mod test {
 
     use super::*;
 
+    #[test]
+    fn test_url() {
+        let path = "/dir/sss";
+
+        let u = url::Url::parse(path);
+
+        println!("{:#?}", u)
+    }
+
+    #[test]
+    fn test_new_endpont() {
+        let arg = "./data";
+        let ep = Endpoint::new(arg).unwrap();
+
+        println!("{:?}", ep);
+    }
+
     #[test]
     fn test_create_server_endpoints() {
         let cases = vec![(

ecstore/src/erasure.rs

@@ -73,8 +73,8 @@ mod test {
 
     use super::*;
 
-    #[tokio::test]
+    #[test]
-    async fn test_erasure() {
+    fn test_erasure() {
         let data_shards = 3;
         let parity_shards = 2;
         let data: &[u8] = &[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];

rustfs/Cargo.toml

@@ -8,23 +8,16 @@ rust-version.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-
-[[bin]]
-name = "rustfs"
-# required-features = ["binary"]
-
-
-# [features]
-# binary = ["tokio/full", "dep:clap", "dep:tracing-subscriber", "dep:hyper-util"]
-
 [dependencies]
-ecstore = { path = "../ecstore" }
+async-trait.workspace = true
-clap = { version = "4.5.7", features = ["derive"] }
+tracing.workspace = true 
-s3s = { version = "0.10.0" }
+anyhow.workspace = true
-anyhow = { version = "1.0.86" }
-tracing = { workspace = true }
-tracing-subscriber = { version = "0.3.18", features = ["env-filter", "time"] }
 time = { workspace = true, features = ["parsing", "formatting"] }
-async-trait = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "macros", "net", "signal"] }
+
+ecstore = { path = "../ecstore" }
+
+s3s = "0.10.0"
+clap = { version = "4.5.7", features = ["derive"] }
+tracing-subscriber = { version = "0.3.18", features = ["env-filter", "time"] }
 hyper-util = { version = "0.1.5", features = ["tokio", "server-auto", "server-graceful"] }

rustfs/src/main.rs

@@ -3,7 +3,6 @@ mod storage;
 
 use anyhow::Result;
 use clap::Parser;
-use ecstore::store::ECStore;
 use hyper_util::{
     rt::{TokioExecutor, TokioIo},
     server::conn::auto::Builder as ConnBuilder,

rustfs/src/storage/mod.rs

@@ -1,4 +1 @@
 pub mod ecfs;
-mod simple_fs;
-
-pub use simple_fs::SimpleFS;

rustfs/src/storage/simple_fs.rs

@@ -1,6 +0,0 @@
-use s3s::S3;
-
-pub struct SimpleFS {}
-
-#[async_trait::async_trait]
-impl S3 for SimpleFS {}